cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to rails 4.1.5

Browse source
This commit is contained in:
Tom Hughes 2014-08-19 09:26:34 +01:00
parent 821c2fa2d8
commit ebe82bbb5d
2 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,7 +1,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
# Require rails # Require rails
gem 'rails', '4.1.4' gem 'rails', '4.1.5'
# Require things which have moved to gems in ruby 1.9 # Require things which have moved to gems in ruby 1.9
gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19

62
Gemfile.lock
View file

@ -2,36 +2,36 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
SystemTimer (1.2.3) SystemTimer (1.2.3)
actionmailer (4.1.4) actionmailer (4.1.5)
actionpack (= 4.1.4) actionpack (= 4.1.5)
actionview (= 4.1.4) actionview (= 4.1.5)
mail (~> 2.5.4) mail (~> 2.5.4)
actionpack (4.1.4) actionpack (4.1.5)
actionview (= 4.1.4) actionview (= 4.1.5)
activesupport (= 4.1.4) activesupport (= 4.1.5)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionpack-page_caching (1.0.2) actionpack-page_caching (1.0.2)
actionpack (>= 4.0.0, < 5) actionpack (>= 4.0.0, < 5)
actionview (4.1.4) actionview (4.1.5)
activesupport (= 4.1.4) activesupport (= 4.1.5)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.4) activemodel (4.1.5)
activesupport (= 4.1.4) activesupport (= 4.1.5)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.4) activerecord (4.1.5)
activemodel (= 4.1.4) activemodel (= 4.1.5)
activesupport (= 4.1.4) activesupport (= 4.1.5)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.4) activesupport (4.1.5)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (5.0.1.20140414130214) arel (5.0.1.20140414130214)
autoprefixer-rails (2.1.1.20140710) autoprefixer-rails (2.2.0.20140804)
execjs execjs
bigdecimal (1.1.0) bigdecimal (1.1.0)
builder (3.2.2) builder (3.2.2)
@ -54,7 +54,7 @@ GEM
execjs execjs
coffee-script-source (1.7.1) coffee-script-source (1.7.1)
colorize (0.7.3) colorize (0.7.3)
composite_primary_keys (7.0.6) composite_primary_keys (7.0.10)
activerecord (~> 4.1.4) activerecord (~> 4.1.4)
crass (0.2.1) crass (0.2.1)
dalli (2.7.2) dalli (2.7.2)
@ -66,7 +66,7 @@ GEM
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
hike (1.2.3) hike (1.2.3)
htmlentities (4.3.2) htmlentities (4.3.2)
http_accept_language (2.0.1) http_accept_language (2.0.2)
httpclient (2.4.0) httpclient (2.4.0)
i18n (0.6.11) i18n (0.6.11)
iconv (0.1) iconv (0.1)
@ -81,7 +81,7 @@ GEM
jsonify (< 0.4.0) jsonify (< 0.4.0)
jwt (1.0.0) jwt (1.0.0)
kgio (2.9.2) kgio (2.9.2)
konacha (3.2.3) konacha (3.2.4)
actionpack (>= 3.1, < 5) actionpack (>= 3.1, < 5)
capybara capybara
colorize colorize
@ -138,22 +138,22 @@ GEM
ruby-openid (>= 2.1.8) ruby-openid (>= 2.1.8)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.4) rails (4.1.5)
actionmailer (= 4.1.4) actionmailer (= 4.1.5)
actionpack (= 4.1.4) actionpack (= 4.1.5)
actionview (= 4.1.4) actionview (= 4.1.5)
activemodel (= 4.1.4) activemodel (= 4.1.5)
activerecord (= 4.1.4) activerecord (= 4.1.5)
activesupport (= 4.1.4) activesupport (= 4.1.5)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4) railties (= 4.1.5)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails-i18n (4.0.2) rails-i18n (4.0.2)
i18n (~> 0.6) i18n (~> 0.6)
rails (>= 4.0) rails (>= 4.0)
railties (4.1.4) railties (4.1.5)
actionpack (= 4.1.4) actionpack (= 4.1.5)
activesupport (= 4.1.4) activesupport (= 4.1.5)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.3.2)
@ -187,7 +187,7 @@ GEM
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (1.2.1) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.3) uglifier (2.5.3)
execjs (>= 0.3.0) execjs (>= 0.3.0)
@ -231,7 +231,7 @@ DEPENDENCIES
psych psych
r2 r2
rack-cors rack-cors
rails (= 4.1.4) rails (= 4.1.5)
rails-i18n (~> 4.0.0) rails-i18n (~> 4.0.0)
redcarpet redcarpet
rinku (>= 1.2.2) rinku (>= 1.2.2)