diff --git a/Gemfile b/Gemfile index b75c2d8..d8f918e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source :rubygems source "http://gems.github.com" -gem "rails", "2.3.5", :require => nil +gem "rails", "2.3.14" gem "hoptoad_notifier", "2.4.9" gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls" gem "thoughtbot-paperclip", "2.3.1", diff --git a/Gemfile.lock b/Gemfile.lock index ab7ccb8..6e7ccde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,16 +2,16 @@ GEM remote: http://rubygems.org/ remote: http://gems.github.com/ specs: - actionmailer (2.3.5) - actionpack (= 2.3.5) - actionpack (2.3.5) - activesupport (= 2.3.5) - rack (~> 1.0.0) - activerecord (2.3.5) - activesupport (= 2.3.5) - activeresource (2.3.5) - activesupport (= 2.3.5) - activesupport (2.3.5) + 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) ambethia-smtp-tls (1.1.2) builder (2.1.2) cucumber (0.8.5) @@ -45,13 +45,13 @@ GEM mysql (2.8.1) newrelic_rpm (3.3.0) nokogiri (1.5.0) - rack (1.0.1) - rails (2.3.5) - actionmailer (= 2.3.5) - actionpack (= 2.3.5) - activerecord (= 2.3.5) - activeresource (= 2.3.5) - activesupport (= 2.3.5) + 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) rake (>= 0.8.3) rake (0.9.2.2) redis (1.0.7) @@ -96,7 +96,7 @@ DEPENDENCIES mime-types (= 1.16) mysql (= 2.8.1) newrelic_rpm (= 3.3.0) - rails (= 2.3.5) + rails (= 2.3.14) redis (= 1.0.7) responders (= 0.4.8) rspec (~> 1.3.1) diff --git a/config/environment.rb b/config/environment.rb index a45d822..005441a 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,7 +1,7 @@ # Be sure to restart your server when you modify this file # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') -- libgit2 0.21.2