From fd306095c609a83f510f10945355fc6ae32d31ed Mon Sep 17 00:00:00 2001 From: Holger Just Date: Tue, 12 Feb 2013 12:03:48 +0100 Subject: [PATCH] Bump Rails to 2.3.17 #1233 --- Gemfile | 2 +- config/environment.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 58d8c990..d62e3032 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- source :rubygems -gem "rails", "2.3.16" +gem "rails", "2.3.17" gem "coderay", "~> 1.0.0" gem "i18n", "~> 0.4.2" diff --git a/config/environment.rb b/config/environment.rb index 464adcea..bf5251e3 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -21,9 +21,6 @@ # use RACK_ENV if we are running as a simple rack app ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] if ENV['RACK_ENV'] -# Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.16' unless defined? RAILS_GEM_VERSION - # this is replaced by config.encoding = "utf-8" in rails3 if RUBY_VERSION >= '1.9' Encoding.default_external = 'UTF-8'