Commit 2eacc8cd70ddcbd531e1707743af07d1ca865df9
1 parent
098a1d73
Exists in
master
and in
1 other branch
upgrade Rails to 2.3.16
Showing
18 changed files
with
21 additions
and
21 deletions
Show diff stats
CHANGELOG.md
| 1 | - * Upgrade to Rails 2.3.15 | 1 | + * Upgrade to Rails 2.3.16 |
| 2 | * Add site_stats call to API | 2 | * Add site_stats call to API |
| 3 | * Fix bug in response user_generated_ideas totals over time, where the min and max dates were getting added as strings instead of date objects | 3 | * Fix bug in response user_generated_ideas totals over time, where the min and max dates were getting added as strings instead of date objects |
| 4 | * Update choices to act_as_versioned | 4 | * Update choices to act_as_versioned |
Gemfile
| @@ -3,7 +3,7 @@ source "http://gems.github.com" | @@ -3,7 +3,7 @@ source "http://gems.github.com" | ||
| 3 | 3 | ||
| 4 | gem "rake", "~> 0.9.2.2" | 4 | gem "rake", "~> 0.9.2.2" |
| 5 | gem "rdoc", "~> 3.12" | 5 | gem "rdoc", "~> 3.12" |
| 6 | -gem "rails", "2.3.15" | 6 | +gem "rails", "2.3.16" |
| 7 | gem "hoptoad_notifier", "2.4.9" | 7 | gem "hoptoad_notifier", "2.4.9" |
| 8 | gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls" | 8 | gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls" |
| 9 | gem "paperclip", "2.3.1" | 9 | gem "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.15) | ||
| 6 | - actionpack (= 2.3.15) | ||
| 7 | - actionpack (2.3.15) | ||
| 8 | - activesupport (= 2.3.15) | ||
| 9 | - rack (~> 1.1.3) | ||
| 10 | - activerecord (2.3.15) | ||
| 11 | - activesupport (= 2.3.15) | ||
| 12 | - activeresource (2.3.15) | ||
| 13 | - activesupport (= 2.3.15) | ||
| 14 | - activesupport (2.3.15) | 5 | + actionmailer (2.3.16) |
| 6 | + actionpack (= 2.3.16) | ||
| 7 | + actionpack (2.3.16) | ||
| 8 | + activesupport (= 2.3.16) | ||
| 9 | + rack (~> 1.1.0) | ||
| 10 | + activerecord (2.3.16) | ||
| 11 | + activesupport (= 2.3.16) | ||
| 12 | + activeresource (2.3.16) | ||
| 13 | + activesupport (= 2.3.16) | ||
| 14 | + activesupport (2.3.16) | ||
| 15 | ambethia-smtp-tls (1.1.2) | 15 | ambethia-smtp-tls (1.1.2) |
| 16 | builder (3.0.0) | 16 | builder (3.0.0) |
| 17 | cucumber (1.1.0) | 17 | cucumber (1.1.0) |
| @@ -51,13 +51,13 @@ GEM | @@ -51,13 +51,13 @@ GEM | ||
| 51 | newrelic_rpm (3.5.5.38) | 51 | newrelic_rpm (3.5.5.38) |
| 52 | nokogiri (1.5.5) | 52 | nokogiri (1.5.5) |
| 53 | paperclip (2.3.1) | 53 | paperclip (2.3.1) |
| 54 | - rack (1.1.4) | ||
| 55 | - rails (2.3.15) | ||
| 56 | - actionmailer (= 2.3.15) | ||
| 57 | - actionpack (= 2.3.15) | ||
| 58 | - activerecord (= 2.3.15) | ||
| 59 | - activeresource (= 2.3.15) | ||
| 60 | - activesupport (= 2.3.15) | 54 | + rack (1.1.5) |
| 55 | + rails (2.3.16) | ||
| 56 | + actionmailer (= 2.3.16) | ||
| 57 | + actionpack (= 2.3.16) | ||
| 58 | + activerecord (= 2.3.16) | ||
| 59 | + activeresource (= 2.3.16) | ||
| 60 | + activesupport (= 2.3.16) | ||
| 61 | rake (>= 0.8.3) | 61 | rake (>= 0.8.3) |
| 62 | rake (0.9.2.2) | 62 | rake (0.9.2.2) |
| 63 | rdoc (3.12) | 63 | rdoc (3.12) |
| @@ -106,7 +106,7 @@ DEPENDENCIES | @@ -106,7 +106,7 @@ DEPENDENCIES | ||
| 106 | mysql2 (= 0.2.18) | 106 | mysql2 (= 0.2.18) |
| 107 | newrelic_rpm | 107 | newrelic_rpm |
| 108 | paperclip (= 2.3.1) | 108 | paperclip (= 2.3.1) |
| 109 | - rails (= 2.3.15) | 109 | + rails (= 2.3.16) |
| 110 | rake (~> 0.9.2.2) | 110 | rake (~> 0.9.2.2) |
| 111 | rdoc (~> 3.12) | 111 | rdoc (~> 3.12) |
| 112 | redis (~> 3.0.1) | 112 | redis (~> 3.0.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.15' unless defined? RAILS_GEM_VERSION | 4 | +RAILS_GEM_VERSION = '2.3.16' 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') |
vendor/cache/actionmailer-2.3.15.gem
No preview for this file type
No preview for this file type
vendor/cache/actionpack-2.3.15.gem
No preview for this file type
No preview for this file type
vendor/cache/activerecord-2.3.15.gem
No preview for this file type
No preview for this file type
vendor/cache/activeresource-2.3.15.gem
No preview for this file type
No preview for this file type
vendor/cache/activesupport-2.3.15.gem
No preview for this file type
No preview for this file type
vendor/cache/rack-1.1.4.gem
No preview for this file type
No preview for this file type
vendor/cache/rails-2.3.15.gem
No preview for this file type
No preview for this file type