diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 37 | ||||
| -rw-r--r-- | config/environment.rb | 2 |
3 files changed, 21 insertions, 20 deletions
@@ -7,7 +7,7 @@ if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.s end source :rubygems -gem 'rails', '2.3.14' +gem 'rails', '2.3.15' gem 'pg' gem 'fast_gettext', '>= 0.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index f2cdd9d40..ce904f286 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,16 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (2.3.14) - actionpack (= 2.3.14) - actionpack (2.3.14) - activesupport (= 2.3.14) - rack (~> 1.1.0) - activerecord (2.3.14) - activesupport (= 2.3.14) - activeresource (2.3.14) - activesupport (= 2.3.14) - activesupport (2.3.14) + actionmailer (2.3.15) + actionpack (= 2.3.15) + actionpack (2.3.15) + activesupport (= 2.3.15) + rack (~> 1.1.3) + activerecord (2.3.15) + activesupport (= 2.3.15) + activeresource (2.3.15) + activesupport (= 2.3.15) + activesupport (2.3.15) annotate (2.4.0) archive-tar-minitar (0.5.2) bootstrap-sass (2.1.1.0) @@ -21,6 +21,7 @@ GEM net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) chunky_png (1.2.6) + columnize (0.3.6) compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -75,13 +76,13 @@ GEM newrelic_rpm (3.4.1) pg (0.13.2) polyglot (0.3.3) - rack (1.1.3) - rails (2.3.14) - actionmailer (= 2.3.14) - actionpack (= 2.3.14) - activerecord (= 2.3.14) - activeresource (= 2.3.14) - activesupport (= 2.3.14) + rack (1.1.4) + rails (2.3.15) + actionmailer (= 2.3.15) + actionpack (= 2.3.15) + activerecord (= 2.3.15) + activeresource (= 2.3.15) + activesupport (= 2.3.15) rake (>= 0.8.3) rake (0.9.2.2) rbx-require-relative (0.0.9) @@ -163,7 +164,7 @@ DEPENDENCIES newrelic_rpm pg rack (~> 1.1.0) - rails (= 2.3.14) + rails (= 2.3.15) rake (~> 0.9.2.2) rdoc (~> 2.4.3) recaptcha (~> 0.3.1) diff --git a/config/environment.rb b/config/environment.rb index de20e73e4..447f7a49b 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -10,7 +10,7 @@ end # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') |