Merge pull request #163 from openHPI/chore/no-more-coffee

Caffeine withdrawal
This commit is contained in:
rteusner
2018-03-22 15:11:46 +01:00
committed by GitHub
2 changed files with 6 additions and 4 deletions

View File

@ -4,7 +4,6 @@ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'bcrypt' gem 'bcrypt'
gem 'bootstrap-will_paginate' gem 'bootstrap-will_paginate'
gem 'carrierwave' gem 'carrierwave'
gem 'coffee-rails'
gem 'concurrent-ruby' gem 'concurrent-ruby'
gem 'concurrent-ruby-ext', platform: :ruby gem 'concurrent-ruby-ext', platform: :ruby
gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders' gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
@ -28,7 +27,7 @@ gem 'ransack'
gem 'rubytree' gem 'rubytree'
gem 'sass-rails' gem 'sass-rails'
gem 'sdoc', group: :doc gem 'sdoc', group: :doc
gem 'slim' gem 'slim-rails'
gem 'bootstrap_pagedown' gem 'bootstrap_pagedown'
gem 'pagedown-rails' gem 'pagedown-rails'
gem 'sorcery' gem 'sorcery'

View File

@ -320,6 +320,10 @@ GEM
slim (3.0.9) slim (3.0.9)
temple (>= 0.7.6, < 0.9) temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slim-rails (3.1.3)
actionpack (>= 3.1)
railties (>= 3.1)
slim (~> 3.0)
sorcery (0.11.0) sorcery (0.11.0)
bcrypt (~> 3.1) bcrypt (~> 3.1)
oauth (~> 0.4, >= 0.4.4) oauth (~> 0.4, >= 0.4.4)
@ -390,7 +394,6 @@ DEPENDENCIES
capybara-selenium capybara-selenium
carrierwave carrierwave
codeclimate-test-reporter codeclimate-test-reporter
coffee-rails
concurrent-ruby concurrent-ruby
concurrent-ruby-ext concurrent-ruby-ext
d3-rails (~> 4.0) d3-rails (~> 4.0)
@ -430,7 +433,7 @@ DEPENDENCIES
sass-rails sass-rails
sdoc sdoc
simplecov simplecov
slim slim-rails
sorcery sorcery
spring spring
thread_safe thread_safe