Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.1.1'
gem 'rails', '5.0.0'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand All @@ -12,16 +12,16 @@ gem 'json'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.1.4'
gem 'coffee-rails', '~> 3.1.1'
gem 'sass-rails', '~> 5.0.5'
gem 'coffee-rails', '~> 4.1.1'
gem 'uglifier', '>= 1.0.3'
end

gem 'json'

gem 'atom'
gem 'jquery-rails'
gem "haml-rails"
gem 'jquery-rails', '>= 4.0.1'
gem "haml-rails", ">= 0.5.3"

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
Expand Down