Skip to content

Commit

Permalink
upgrade to Rails 3.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
maxwell committed May 15, 2012
1 parent 4d58940 commit ab2e740
Show file tree
Hide file tree
Showing 21 changed files with 139 additions and 467 deletions.
11 changes: 5 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ source 'http://rubygems.org'
gem 'bundler', '> 1.1.0'
ruby '1.9.3' if ENV['HEROKU']

gem 'rails', '3.1.4'
gem 'rails_autolink'
gem 'rails', '3.2.3'

gem 'foreman', '0.41'
gem 'whenever'

gem 'rails_autolink'
gem 'thin', '~> 1.3.1', :require => false

# cross-origin resource sharing
Expand All @@ -21,7 +22,7 @@ gem 'jwt'
gem 'oauth2-provider', '0.0.19'
gem 'remotipart', '~> 1.0'

gem 'omniauth', '1.0.1'
gem 'omniauth', '1.0.3'
gem 'omniauth-facebook'
gem 'omniauth-tumblr'
gem 'omniauth-twitter'
Expand Down Expand Up @@ -112,8 +113,8 @@ gem 'gon'
# assets

group :assets do
gem 'sass-rails', '3.1.4'
gem 'bootstrap-sass', '~> 2.0.2'
gem 'sass-rails', '3.2.5'

# Windows and OSX have an execjs compatible runtime built-in, Linux users should
# install Node.js or use 'therubyracer'.
Expand Down Expand Up @@ -186,8 +187,6 @@ group :development do
gem 'parallel_tests', :require => false
gem 'yard', :require => false

# rails 3.2 goodness
gem 'active_reload'

# for tracing AR object instantiation and memory usage per request
gem 'oink'
Expand Down
Loading

0 comments on commit ab2e740

Please sign in to comment.