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

Update to rails 4.0.4

Browse source
This commit is contained in:
Tom Hughes 2014-03-14 18:58:02 +00:00
parent 24e22dde6e
commit faa77f7bcd
2 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

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

57
Gemfile.lock
View file

@ -2,28 +2,28 @@ GEM
remote: http://rubygems.org/
specs:
SystemTimer (1.2.3)
actionmailer (4.0.3)
actionpack (= 4.0.3)
actionmailer (4.0.4)
actionpack (= 4.0.4)
mail (~> 2.5.4)
actionpack (4.0.3)
activesupport (= 4.0.3)
actionpack (4.0.4)
activesupport (= 4.0.4)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionpack-page_caching (1.0.2)
actionpack (>= 4.0.0, < 5)
activemodel (4.0.3)
activesupport (= 4.0.3)
activemodel (4.0.4)
activesupport (= 4.0.4)
builder (~> 3.1.0)
activerecord (4.0.3)
activemodel (= 4.0.3)
activerecord (4.0.4)
activemodel (= 4.0.4)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.3)
activesupport (= 4.0.4)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.3)
i18n (~> 0.6, >= 0.6.4)
activesupport (4.0.4)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
@ -50,7 +50,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
colorize (0.6.0)
colorize (0.7.0)
composite_primary_keys (6.0.1)
activerecord (>= 4.0.0)
dalli (2.7.0)
@ -78,7 +78,7 @@ GEM
jwt (0.1.11)
multi_json (>= 1.5)
kgio (2.9.2)
konacha (3.1.0)
konacha (3.2.0)
actionpack (>= 3.1, < 5)
capybara
colorize
@ -91,7 +91,7 @@ GEM
mime-types (1.25.1)
mini_portile (0.5.2)
minitest (4.7.5)
multi_json (1.8.4)
multi_json (1.9.0)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.1)
@ -133,20 +133,20 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.3)
actionmailer (= 4.0.3)
actionpack (= 4.0.3)
activerecord (= 4.0.3)
activesupport (= 4.0.3)
rails (4.0.4)
actionmailer (= 4.0.4)
actionpack (= 4.0.4)
activerecord (= 4.0.4)
activesupport (= 4.0.4)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.3)
railties (= 4.0.4)
sprockets-rails (~> 2.0.0)
rails-i18n (4.0.1)
i18n (~> 0.6)
rails (~> 4.0)
railties (4.0.3)
actionpack (= 4.0.3)
activesupport (= 4.0.3)
railties (4.0.4)
actionpack (= 4.0.4)
activesupport (= 4.0.4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.1)
@ -155,10 +155,11 @@ GEM
ruby-openid (2.5.0)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sass (3.2.14)
sass-rails (4.0.1)
sass (3.2.15)
sass-rails (4.0.2)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0.0)
soap4r-ruby1.9 (2.0.5)
sprockets (2.11.0)
@ -178,7 +179,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.38)
tzinfo (0.3.39)
uglifier (2.4.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
@ -220,7 +221,7 @@ DEPENDENCIES
psych
r2
rack-cors
rails (= 4.0.3)
rails (= 4.0.4)
rails-i18n (~> 4.0.0)
redcarpet
rinku (>= 1.2.2)