Update to rails 3.1.1
This commit is contained in:
Tom Hughes
parent
1f383dcbd7
commit
570fd3b6aa
3 changed files with 37 additions and 39 deletions
2
Gemfile
2
Gemfile
|
|
@ -2,7 +2,7 @@
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
# Require rails
|
# Require rails
|
||||||
gem 'rails', '3.1.0'
|
gem 'rails', '3.1.1'
|
||||||
|
|
||||||
# Require the postgres database driver
|
# Require the postgres database driver
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
|
|
|
||||||
72
Gemfile.lock
72
Gemfile.lock
|
|
@ -2,38 +2,36 @@ GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
SystemTimer (1.2.3)
|
SystemTimer (1.2.3)
|
||||||
actionmailer (3.1.0)
|
actionmailer (3.1.1)
|
||||||
actionpack (= 3.1.0)
|
actionpack (= 3.1.1)
|
||||||
mail (~> 2.3.0)
|
mail (~> 2.3.0)
|
||||||
actionpack (3.1.0)
|
actionpack (3.1.1)
|
||||||
activemodel (= 3.1.0)
|
activemodel (= 3.1.1)
|
||||||
activesupport (= 3.1.0)
|
activesupport (= 3.1.1)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
rack (~> 1.3.2)
|
rack (~> 1.3.2)
|
||||||
rack-cache (~> 1.0.3)
|
rack-cache (~> 1.1)
|
||||||
rack-mount (~> 0.8.2)
|
rack-mount (~> 0.8.2)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.0.0)
|
sprockets (~> 2.0.2)
|
||||||
activemodel (3.1.0)
|
activemodel (3.1.1)
|
||||||
activesupport (= 3.1.0)
|
activesupport (= 3.1.1)
|
||||||
bcrypt-ruby (~> 3.0.0)
|
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
activerecord (3.1.0)
|
activerecord (3.1.1)
|
||||||
activemodel (= 3.1.0)
|
activemodel (= 3.1.1)
|
||||||
activesupport (= 3.1.0)
|
activesupport (= 3.1.1)
|
||||||
arel (~> 2.2.1)
|
arel (~> 2.2.1)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.1.0)
|
activeresource (3.1.1)
|
||||||
activemodel (= 3.1.0)
|
activemodel (= 3.1.1)
|
||||||
activesupport (= 3.1.0)
|
activesupport (= 3.1.1)
|
||||||
activesupport (3.1.0)
|
activesupport (3.1.1)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
addressable (2.2.6)
|
addressable (2.2.6)
|
||||||
arel (2.2.1)
|
arel (2.2.1)
|
||||||
bcrypt-ruby (3.0.1)
|
|
||||||
builder (3.0.0)
|
builder (3.0.0)
|
||||||
coffee-rails (3.1.1)
|
coffee-rails (3.1.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
|
|
@ -48,10 +46,10 @@ GEM
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (1.2.9)
|
execjs (1.2.9)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
faraday (0.7.4)
|
faraday (0.7.5)
|
||||||
addressable (~> 2.2.6)
|
addressable (~> 2.2.6)
|
||||||
multipart-post (~> 1.1.0)
|
multipart-post (~> 1.1.3)
|
||||||
rack (< 2, >= 1.1.0)
|
rack (>= 1.1.0, < 2)
|
||||||
hike (1.2.1)
|
hike (1.2.1)
|
||||||
httpclient (2.2.1)
|
httpclient (2.2.1)
|
||||||
i18n (0.6.0)
|
i18n (0.6.0)
|
||||||
|
|
@ -80,8 +78,8 @@ GEM
|
||||||
polyglot (0.3.2)
|
polyglot (0.3.2)
|
||||||
prototype-rails (3.1.0)
|
prototype-rails (3.1.0)
|
||||||
rails (~> 3.1)
|
rails (~> 3.1)
|
||||||
rack (1.3.3)
|
rack (1.3.4)
|
||||||
rack-cache (1.0.3)
|
rack-cache (1.1)
|
||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-mount (0.8.3)
|
rack-mount (0.8.3)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
|
|
@ -92,21 +90,21 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.1)
|
rack-test (0.6.1)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.1.0)
|
rails (3.1.1)
|
||||||
actionmailer (= 3.1.0)
|
actionmailer (= 3.1.1)
|
||||||
actionpack (= 3.1.0)
|
actionpack (= 3.1.1)
|
||||||
activerecord (= 3.1.0)
|
activerecord (= 3.1.1)
|
||||||
activeresource (= 3.1.0)
|
activeresource (= 3.1.1)
|
||||||
activesupport (= 3.1.0)
|
activesupport (= 3.1.1)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.1.0)
|
railties (= 3.1.1)
|
||||||
rails-i18n-updater (1.0.1)
|
rails-i18n-updater (1.0.1)
|
||||||
actionpack
|
actionpack
|
||||||
activesupport
|
activesupport
|
||||||
rails
|
rails
|
||||||
railties (3.1.0)
|
railties (3.1.1)
|
||||||
actionpack (= 3.1.0)
|
actionpack (= 3.1.1)
|
||||||
activesupport (= 3.1.0)
|
activesupport (= 3.1.1)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
|
|
@ -118,14 +116,14 @@ GEM
|
||||||
ruby-openid (2.1.8)
|
ruby-openid (2.1.8)
|
||||||
sanitize (2.0.3)
|
sanitize (2.0.3)
|
||||||
nokogiri (< 1.6, >= 1.4.4)
|
nokogiri (< 1.6, >= 1.4.4)
|
||||||
sass (3.1.7)
|
sass (3.1.10)
|
||||||
sass-rails (3.1.3)
|
sass-rails (3.1.4)
|
||||||
actionpack (~> 3.1.0)
|
actionpack (~> 3.1.0)
|
||||||
railties (~> 3.1.0)
|
railties (~> 3.1.0)
|
||||||
sass (>= 3.1.4)
|
sass (>= 3.1.4)
|
||||||
sprockets (~> 2.0.0)
|
sprockets (~> 2.0.0)
|
||||||
tilt (~> 1.3.2)
|
tilt (~> 1.3.2)
|
||||||
sprockets (2.0.0)
|
sprockets (2.0.2)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (!= 1.3.0, ~> 1.1)
|
tilt (!= 1.3.0, ~> 1.1)
|
||||||
|
|
@ -156,7 +154,7 @@ DEPENDENCIES
|
||||||
open_id_authentication (>= 1.1.0)
|
open_id_authentication (>= 1.1.0)
|
||||||
pg
|
pg
|
||||||
prototype-rails
|
prototype-rails
|
||||||
rails (= 3.1.0)
|
rails (= 3.1.1)
|
||||||
rails-i18n-updater
|
rails-i18n-updater
|
||||||
rinku (>= 1.2.2)
|
rinku (>= 1.2.2)
|
||||||
rmagick
|
rmagick
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ OpenStreetMap::Application.configure do
|
||||||
config.assets.compress = true
|
config.assets.compress = true
|
||||||
|
|
||||||
# Don't fallback to assets pipeline if a precompiled asset is missed
|
# Don't fallback to assets pipeline if a precompiled asset is missed
|
||||||
config.assets.compile = true
|
config.assets.compile = false
|
||||||
|
|
||||||
# Generate digests for assets URLs
|
# Generate digests for assets URLs
|
||||||
config.assets.digest = true
|
config.assets.digest = true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue