Skip to content

Commit

Permalink
Upgraded gems
Browse files Browse the repository at this point in the history
  • Loading branch information
fredwu committed Jan 7, 2012
1 parent b0a2b52 commit a959e88
Show file tree
Hide file tree
Showing 9 changed files with 149 additions and 190 deletions.
27 changes: 14 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ gem 'rails', '~> 3.1.3'
gem 'mysql2'

# core function gems
gem 'devise', '~> 1.4.2'
gem 'omniauth', '~> 0.2.0'
gem 'inherited_resources', '~> 1.2.0'
gem 'simple_form', '~> 1.4.0'
gem 'devise', '~> 2.0.0.rc'
gem 'omniauth', '~> 1.0.1'
gem 'inherited_resources', '~> 1.3.0'
gem 'simple_form', '~> 1.5.2'
gem 'nested_form', :git => 'git://github.com/ryanb/nested_form.git'
gem 'squeel', '~> 0.8.0'
gem 'squeel', '~> 0.9.3'
gem 'rails_config'
gem 'has_scope'
gem 'kaminari'
Expand All @@ -19,11 +19,8 @@ gem 'carmen'
gem 'geo_location'

# asset gems
gem 'slim', '~> 1.0.0'
gem 'slim', '~> 1.1.0'
gem 'slim-rails'
gem 'sass'
gem 'coffee-script'
gem 'uglifier'
gem 'modernizr-rails'
gem 'jquery-rails'
gem 'mini_magick'
Expand All @@ -34,12 +31,16 @@ gem 'client_side_validations', '~> 3.1.0'
gem 'execjs'
gem 'therubyracer'

group :assets do
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end

group :development, :test do
gem 'cucumber-rails'
gem 'capybara', '~> 1.0.0'
gem 'rspec-rails', '~> 2.6.1'
gem 'capybara', '~> 1.1.2'
gem 'rspec-rails', '~> 2.8.1'
gem 'machinist', '~> 2.0.0.beta2'
gem 'pickle'
gem 'ffaker'
gem 'delorean'
gem 'database_cleaner'
Expand Down
Loading

0 comments on commit a959e88

Please sign in to comment.