diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cdf683..f935b3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ + * Upgrade to Rails 2.3.15 * Add site_stats call to API * 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 * Update choices to act_as_versioned diff --git a/Gemfile b/Gemfile index 35ab835..b1ccf0c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "http://gems.github.com" gem "rake", "~> 0.9.2.2" gem "rdoc", "~> 3.12" -gem "rails", "2.3.14" +gem "rails", "2.3.15" gem "hoptoad_notifier", "2.4.9" gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls" gem "paperclip", "2.3.1" diff --git a/Gemfile.lock b/Gemfile.lock index 88d63ad..39f7922 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.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) ambethia-smtp-tls (1.1.2) builder (3.0.0) cucumber (1.1.0) @@ -51,13 +51,13 @@ GEM newrelic_rpm (3.5.3.25) nokogiri (1.5.5) paperclip (2.3.1) - 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) rdoc (3.12) @@ -106,7 +106,7 @@ DEPENDENCIES mysql2 (= 0.2.18) newrelic_rpm paperclip (= 2.3.1) - rails (= 2.3.14) + rails (= 2.3.15) rake (~> 0.9.2.2) rdoc (~> 3.12) redis (~> 3.0.1) diff --git a/config/environment.rb b/config/environment.rb index bbcd4c8..433b975 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.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') diff --git a/vendor/cache/actionmailer-2.3.14.gem b/vendor/cache/actionmailer-2.3.14.gem deleted file mode 100644 index 9449ff8..0000000 Binary files a/vendor/cache/actionmailer-2.3.14.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-2.3.15.gem b/vendor/cache/actionmailer-2.3.15.gem new file mode 100644 index 0000000..4f9bc80 Binary files /dev/null and b/vendor/cache/actionmailer-2.3.15.gem differ diff --git a/vendor/cache/actionpack-2.3.14.gem b/vendor/cache/actionpack-2.3.14.gem deleted file mode 100644 index a019f96..0000000 Binary files a/vendor/cache/actionpack-2.3.14.gem and /dev/null differ diff --git a/vendor/cache/actionpack-2.3.15.gem b/vendor/cache/actionpack-2.3.15.gem new file mode 100644 index 0000000..da1b36e Binary files /dev/null and b/vendor/cache/actionpack-2.3.15.gem differ diff --git a/vendor/cache/activerecord-2.3.14.gem b/vendor/cache/activerecord-2.3.14.gem deleted file mode 100644 index 3860c58..0000000 Binary files a/vendor/cache/activerecord-2.3.14.gem and /dev/null differ diff --git a/vendor/cache/activerecord-2.3.15.gem b/vendor/cache/activerecord-2.3.15.gem new file mode 100644 index 0000000..a4520e8 Binary files /dev/null and b/vendor/cache/activerecord-2.3.15.gem differ diff --git a/vendor/cache/activeresource-2.3.14.gem b/vendor/cache/activeresource-2.3.14.gem deleted file mode 100644 index cde764c..0000000 Binary files a/vendor/cache/activeresource-2.3.14.gem and /dev/null differ diff --git a/vendor/cache/activeresource-2.3.15.gem b/vendor/cache/activeresource-2.3.15.gem new file mode 100644 index 0000000..7ed0f1e Binary files /dev/null and b/vendor/cache/activeresource-2.3.15.gem differ diff --git a/vendor/cache/activesupport-2.3.14.gem b/vendor/cache/activesupport-2.3.14.gem deleted file mode 100644 index 7dba3ec..0000000 Binary files a/vendor/cache/activesupport-2.3.14.gem and /dev/null differ diff --git a/vendor/cache/activesupport-2.3.15.gem b/vendor/cache/activesupport-2.3.15.gem new file mode 100644 index 0000000..8a31498 Binary files /dev/null and b/vendor/cache/activesupport-2.3.15.gem differ diff --git a/vendor/cache/rack-1.1.3.gem b/vendor/cache/rack-1.1.3.gem deleted file mode 100644 index b2a556f..0000000 Binary files a/vendor/cache/rack-1.1.3.gem and /dev/null differ diff --git a/vendor/cache/rack-1.1.4.gem b/vendor/cache/rack-1.1.4.gem new file mode 100644 index 0000000..c9fd68b Binary files /dev/null and b/vendor/cache/rack-1.1.4.gem differ diff --git a/vendor/cache/rails-2.3.14.gem b/vendor/cache/rails-2.3.14.gem deleted file mode 100644 index 822d964..0000000 Binary files a/vendor/cache/rails-2.3.14.gem and /dev/null differ diff --git a/vendor/cache/rails-2.3.15.gem b/vendor/cache/rails-2.3.15.gem new file mode 100644 index 0000000..95cd7f4 Binary files /dev/null and b/vendor/cache/rails-2.3.15.gem differ -- libgit2 0.21.2