From 570fd3b6aae3757a55b969bb45d3e06bdac3332a Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 7 Oct 2011 19:46:19 +0100 Subject: [PATCH] Update to rails 3.1.1 --- Gemfile | 2 +- Gemfile.lock | 72 +++++++++++++++---------------- config/environments/production.rb | 2 +- 3 files changed, 37 insertions(+), 39 deletions(-) diff --git a/Gemfile b/Gemfile index 40a8b6628..dc777110f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.1.0' +gem 'rails', '3.1.1' # Require the postgres database driver gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index c96607d50..31598453c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,36 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.1.0) - actionpack (= 3.1.0) + actionmailer (3.1.1) + actionpack (= 3.1.1) mail (~> 2.3.0) - actionpack (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) + actionpack (3.1.1) + activemodel (= 3.1.1) + activesupport (= 3.1.1) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) rack (~> 1.3.2) - rack-cache (~> 1.0.3) + rack-cache (~> 1.1) rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.0.0) - activemodel (3.1.0) - activesupport (= 3.1.0) - bcrypt-ruby (~> 3.0.0) + sprockets (~> 2.0.2) + activemodel (3.1.1) + activesupport (= 3.1.1) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) + activerecord (3.1.1) + activemodel (= 3.1.1) + activesupport (= 3.1.1) arel (~> 2.2.1) tzinfo (~> 0.3.29) - activeresource (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - activesupport (3.1.0) + activeresource (3.1.1) + activemodel (= 3.1.1) + activesupport (= 3.1.1) + activesupport (3.1.1) multi_json (~> 1.0) addressable (2.2.6) arel (2.2.1) - bcrypt-ruby (3.0.1) builder (3.0.0) coffee-rails (3.1.1) coffee-script (>= 2.2.0) @@ -48,10 +46,10 @@ GEM erubis (2.7.0) execjs (1.2.9) multi_json (~> 1.0) - faraday (0.7.4) + faraday (0.7.5) addressable (~> 2.2.6) - multipart-post (~> 1.1.0) - rack (< 2, >= 1.1.0) + multipart-post (~> 1.1.3) + rack (>= 1.1.0, < 2) hike (1.2.1) httpclient (2.2.1) i18n (0.6.0) @@ -80,8 +78,8 @@ GEM polyglot (0.3.2) prototype-rails (3.1.0) rails (~> 3.1) - rack (1.3.3) - rack-cache (1.0.3) + rack (1.3.4) + rack-cache (1.1) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) @@ -92,21 +90,21 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.0) - actionmailer (= 3.1.0) - actionpack (= 3.1.0) - activerecord (= 3.1.0) - activeresource (= 3.1.0) - activesupport (= 3.1.0) + rails (3.1.1) + actionmailer (= 3.1.1) + actionpack (= 3.1.1) + activerecord (= 3.1.1) + activeresource (= 3.1.1) + activesupport (= 3.1.1) bundler (~> 1.0) - railties (= 3.1.0) + railties (= 3.1.1) rails-i18n-updater (1.0.1) actionpack activesupport rails - railties (3.1.0) - actionpack (= 3.1.0) - activesupport (= 3.1.0) + railties (3.1.1) + actionpack (= 3.1.1) + activesupport (= 3.1.1) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -118,14 +116,14 @@ GEM ruby-openid (2.1.8) sanitize (2.0.3) nokogiri (< 1.6, >= 1.4.4) - sass (3.1.7) - sass-rails (3.1.3) + sass (3.1.10) + sass-rails (3.1.4) actionpack (~> 3.1.0) railties (~> 3.1.0) sass (>= 3.1.4) sprockets (~> 2.0.0) tilt (~> 1.3.2) - sprockets (2.0.0) + sprockets (2.0.2) hike (~> 1.2) rack (~> 1.0) tilt (!= 1.3.0, ~> 1.1) @@ -156,7 +154,7 @@ DEPENDENCIES open_id_authentication (>= 1.1.0) pg prototype-rails - rails (= 3.1.0) + rails (= 3.1.1) rails-i18n-updater rinku (>= 1.2.2) rmagick diff --git a/config/environments/production.rb b/config/environments/production.rb index baa6df644..2e10a46a1 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -15,7 +15,7 @@ OpenStreetMap::Application.configure do config.assets.compress = true # 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 config.assets.digest = true -- 2.39.5