Commit 38eff33bdffb2958492ee298bf6f52e4df38abfd
1 parent
3b2b9e77
Exists in
master
and in
1 other branch
upgrade to rails 2.3.14
Showing
3 changed files
with
20 additions
and
20 deletions
Show diff stats
Gemfile
1 | source :rubygems | 1 | source :rubygems |
2 | source "http://gems.github.com" | 2 | source "http://gems.github.com" |
3 | 3 | ||
4 | -gem "rails", "2.3.5", :require => nil | 4 | +gem "rails", "2.3.14" |
5 | gem "hoptoad_notifier", "2.4.9" | 5 | gem "hoptoad_notifier", "2.4.9" |
6 | gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls" | 6 | gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls" |
7 | gem "thoughtbot-paperclip", "2.3.1", | 7 | gem "thoughtbot-paperclip", "2.3.1", |
Gemfile.lock
@@ -2,16 +2,16 @@ GEM | @@ -2,16 +2,16 @@ GEM | ||
2 | remote: http://rubygems.org/ | 2 | remote: http://rubygems.org/ |
3 | remote: http://gems.github.com/ | 3 | remote: http://gems.github.com/ |
4 | specs: | 4 | specs: |
5 | - actionmailer (2.3.5) | ||
6 | - actionpack (= 2.3.5) | ||
7 | - actionpack (2.3.5) | ||
8 | - activesupport (= 2.3.5) | ||
9 | - rack (~> 1.0.0) | ||
10 | - activerecord (2.3.5) | ||
11 | - activesupport (= 2.3.5) | ||
12 | - activeresource (2.3.5) | ||
13 | - activesupport (= 2.3.5) | ||
14 | - activesupport (2.3.5) | 5 | + actionmailer (2.3.14) |
6 | + actionpack (= 2.3.14) | ||
7 | + actionpack (2.3.14) | ||
8 | + activesupport (= 2.3.14) | ||
9 | + rack (~> 1.1.0) | ||
10 | + activerecord (2.3.14) | ||
11 | + activesupport (= 2.3.14) | ||
12 | + activeresource (2.3.14) | ||
13 | + activesupport (= 2.3.14) | ||
14 | + activesupport (2.3.14) | ||
15 | ambethia-smtp-tls (1.1.2) | 15 | ambethia-smtp-tls (1.1.2) |
16 | builder (2.1.2) | 16 | builder (2.1.2) |
17 | cucumber (0.8.5) | 17 | cucumber (0.8.5) |
@@ -45,13 +45,13 @@ GEM | @@ -45,13 +45,13 @@ GEM | ||
45 | mysql (2.8.1) | 45 | mysql (2.8.1) |
46 | newrelic_rpm (3.3.0) | 46 | newrelic_rpm (3.3.0) |
47 | nokogiri (1.5.0) | 47 | nokogiri (1.5.0) |
48 | - rack (1.0.1) | ||
49 | - rails (2.3.5) | ||
50 | - actionmailer (= 2.3.5) | ||
51 | - actionpack (= 2.3.5) | ||
52 | - activerecord (= 2.3.5) | ||
53 | - activeresource (= 2.3.5) | ||
54 | - activesupport (= 2.3.5) | 48 | + rack (1.1.3) |
49 | + rails (2.3.14) | ||
50 | + actionmailer (= 2.3.14) | ||
51 | + actionpack (= 2.3.14) | ||
52 | + activerecord (= 2.3.14) | ||
53 | + activeresource (= 2.3.14) | ||
54 | + activesupport (= 2.3.14) | ||
55 | rake (>= 0.8.3) | 55 | rake (>= 0.8.3) |
56 | rake (0.9.2.2) | 56 | rake (0.9.2.2) |
57 | redis (1.0.7) | 57 | redis (1.0.7) |
@@ -96,7 +96,7 @@ DEPENDENCIES | @@ -96,7 +96,7 @@ DEPENDENCIES | ||
96 | mime-types (= 1.16) | 96 | mime-types (= 1.16) |
97 | mysql (= 2.8.1) | 97 | mysql (= 2.8.1) |
98 | newrelic_rpm (= 3.3.0) | 98 | newrelic_rpm (= 3.3.0) |
99 | - rails (= 2.3.5) | 99 | + rails (= 2.3.14) |
100 | redis (= 1.0.7) | 100 | redis (= 1.0.7) |
101 | responders (= 0.4.8) | 101 | responders (= 0.4.8) |
102 | rspec (~> 1.3.1) | 102 | rspec (~> 1.3.1) |
config/environment.rb
1 | # Be sure to restart your server when you modify this file | 1 | # Be sure to restart your server when you modify this file |
2 | 2 | ||
3 | # Specifies gem version of Rails to use when vendor/rails is not present | 3 | # Specifies gem version of Rails to use when vendor/rails is not present |
4 | -RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION | 4 | +RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION |
5 | 5 | ||
6 | # Bootstrap the Rails environment, frameworks, and default configuration | 6 | # Bootstrap the Rails environment, frameworks, and default configuration |
7 | require File.join(File.dirname(__FILE__), 'boot') | 7 | require File.join(File.dirname(__FILE__), 'boot') |