Permalink
Browse files

Merge pull request #183 from ArturG/rails_upgrade

Upgraded to rails 3.2.16
  • Loading branch information...
PragTob committed Feb 23, 2014
2 parents 344b4e6 + 61a9647 commit 3180081500fc975114ae0e8be4de86603b2f5b4f
View
22 Gemfile
@@ -5,7 +5,7 @@ source 'http://rubygems.org'
ruby '1.9.3'
-gem 'rails', '3.1.11'
+gem 'rails', '3.2.17'
gem 'json'
gem 'hackety_hack-lessons', '~> 1.1', :require => 'hackety_hack/lessons'
@@ -16,15 +16,7 @@ gem 'mongo_mapper'
gem 'bson_ext'
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 'mm-devise', '~> 2.0'
gem 'cancan'
@@ -36,6 +28,14 @@ gem "semantic_menu", git: "git://github.com/michaek/semantic_menu.git"
gem 'will_paginate' # Pagination
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
# Use unicorn as the web server
gem 'unicorn'
@@ -49,8 +49,6 @@ group :development, :test do
gem "faker"
gem 'pry'
gem 'sqlite3'
-
-
end
group :production do
Oops, something went wrong.

0 comments on commit 3180081

Please sign in to comment.