Skip to content

Commit

Permalink
Merge pull request #183 from ArturG/rails_upgrade
Browse files Browse the repository at this point in the history
Upgraded to rails 3.2.16
  • Loading branch information
PragTob committed Feb 23, 2014
2 parents 344b4e6 + 61a9647 commit 3180081
Show file tree
Hide file tree
Showing 9 changed files with 174 additions and 192 deletions.
22 changes: 10 additions & 12 deletions Gemfile
Expand Up @@ -5,7 +5,7 @@ source 'http://rubygems.org'


ruby '1.9.3' ruby '1.9.3'


gem 'rails', '3.1.11' gem 'rails', '3.2.17'
gem 'json' gem 'json'


gem 'hackety_hack-lessons', '~> 1.1', :require => 'hackety_hack/lessons' gem 'hackety_hack-lessons', '~> 1.1', :require => 'hackety_hack/lessons'
Expand All @@ -16,15 +16,7 @@ gem 'mongo_mapper'
gem 'bson_ext' gem 'bson_ext'


gem "letter_opener", group: :development gem "letter_opener", group: :development


# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', "~> 3.1.0"
gem 'coffee-rails', "~> 3.1.0"
gem 'uglifier'
end

gem "devise", "~> 2.2.2" gem "devise", "~> 2.2.2"
gem 'mm-devise', '~> 2.0' gem 'mm-devise', '~> 2.0'
gem 'cancan' gem 'cancan'
Expand All @@ -36,6 +28,14 @@ gem "semantic_menu", git: "git://github.com/michaek/semantic_menu.git"
gem 'will_paginate' # Pagination gem 'will_paginate' # Pagination
gem 'redcarpet', '~> 3.0' # Markdown gem 'redcarpet', '~> 3.0' # Markdown


# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end

group :development do group :development do
# Use unicorn as the web server # Use unicorn as the web server
gem 'unicorn' gem 'unicorn'
Expand All @@ -49,8 +49,6 @@ group :development, :test do
gem "faker" gem "faker"
gem 'pry' gem 'pry'
gem 'sqlite3' gem 'sqlite3'


end end


group :production do group :production do
Expand Down

0 comments on commit 3180081

Please sign in to comment.