Skip to content

Commit 3180081

Browse files
committed
Merge pull request #183 from ArturG/rails_upgrade
Upgraded to rails 3.2.16
2 parents 344b4e6 + 61a9647 commit 3180081

9 files changed

Lines changed: 174 additions & 192 deletions

File tree

Gemfile

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source 'http://rubygems.org'
55

66
ruby '1.9.3'
77

8-
gem 'rails', '3.1.11'
8+
gem 'rails', '3.2.17'
99
gem 'json'
1010

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

1818
gem "letter_opener", group: :development
19-
20-
# Gems used only for assets and not required
21-
# in production environments by default.
22-
group :assets do
23-
gem 'sass-rails', "~> 3.1.0"
24-
gem 'coffee-rails', "~> 3.1.0"
25-
gem 'uglifier'
26-
end
27-
19+
2820
gem "devise", "~> 2.2.2"
2921
gem 'mm-devise', '~> 2.0'
3022
gem 'cancan'
@@ -36,6 +28,14 @@ gem "semantic_menu", git: "git://github.com/michaek/semantic_menu.git"
3628
gem 'will_paginate' # Pagination
3729
gem 'redcarpet', '~> 3.0' # Markdown
3830

31+
# Gems used only for assets and not required
32+
# in production environments by default.
33+
group :assets do
34+
gem 'sass-rails'
35+
gem 'coffee-rails'
36+
gem 'uglifier'
37+
end
38+
3939
group :development do
4040
# Use unicorn as the web server
4141
gem 'unicorn'
@@ -49,8 +49,6 @@ group :development, :test do
4949
gem "faker"
5050
gem 'pry'
5151
gem 'sqlite3'
52-
53-
5452
end
5553

5654
group :production do

0 commit comments

Comments
 (0)