updated to Rails 4.2

This commit is contained in:
Hauke Klement
2015-02-18 10:41:26 +01:00
parent fcc5a85a76
commit 56acd4c3c3
16 changed files with 199 additions and 132 deletions

11
Gemfile
View File

@ -4,7 +4,7 @@ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'bcrypt', '~> 3.1.7'
gem 'bootstrap-will_paginate'
gem 'carrierwave'
gem 'coffee-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'concurrent-ruby'
gem 'concurrent-ruby-ext', platform: :ruby
gem 'docker-api', require: 'docker'
@ -20,11 +20,11 @@ gem 'pg', platform: :ruby
gem 'pry'
gem 'puma'
gem 'pundit'
gem 'rails', '~> 4.1.2'
gem 'rails', '~> 4.2.0'
gem 'rails-i18n', '~> 4.0.0'
gem 'ransack'
gem 'rubytree'
gem 'sass-rails', '~> 4.0.3'
gem 'sass-rails', '~> 5.0'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'slim'
gem 'sorcery'
@ -43,7 +43,12 @@ group :development do
gem 'capistrano-upload-config'
gem 'rubocop', require: false
gem 'rubocop-rspec'
end
group :development, :test do
gem 'byebug'
gem 'spring'
gem 'web-console', '~> 2.0'
end
group :test do