htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection

Browse Source 
# Conflicts:
#	Capfile
#	Gemfile.lock
#	db/schema.rb
This commit is contained in:
Maximilian Grundke
2018-02-28 16:48:14 +01:00
parent 73929512c6 6f95c1b41c
commit c1b5df044b
44 changed files with 330 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Gemfile
View File

@ -1,42 +1,43 @@
source 'https://rubygems.org'
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'bcrypt', '~> 3.1.7'
gem 'bcrypt'
gem 'bootstrap-will_paginate'
gem 'carrierwave'
gem 'coffee-rails', '~> 4.0.0'
gem 'concurrent-ruby', '~> 1.0.1'
gem 'concurrent-ruby-ext', '~> 1.0.1', platform: :ruby
gem 'docker-api','~> 1.25.0', require: 'docker'
gem 'factory_bot_rails', '~> 4.8.2'
gem 'coffee-rails'
gem 'concurrent-ruby'
gem 'concurrent-ruby-ext', platform: :ruby
gem 'docker-api', require: 'docker'
gem 'factory_bot_rails'
gem 'forgery'
gem 'highline'
gem 'jbuilder', '~> 2.0'
gem 'jbuilder'
gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'ims-lti'
gem 'ims-lti', '1.1.10' # version 1.1.13 will crash, because @provider.valid_request?(request) on lti.rb line 89 will return false.
gem 'kramdown'
gem 'newrelic_rpm'
gem 'pg', platform: :ruby
gem 'pg', '< 1.0', platform: :ruby
gem 'pry-byebug'
gem 'puma', '~> 2.15.3'
gem 'puma'
gem 'pundit'
gem 'rails', '4.2.5'
gem 'rails-i18n', '~> 4.0.0'
gem 'rails', '4.2.10'
gem 'rails-i18n'
gem 'ransack'
gem 'rubytree'
gem 'sass-rails', '~> 4.0.3'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'sass-rails'
gem 'sdoc', group: :doc
gem 'slim'
gem 'bootstrap_pagedown'
gem 'pagedown-rails', '~> 1.1.4'
gem 'pagedown-rails'
gem 'sorcery'
gem 'thread_safe'
gem 'turbolinks'
gem 'uglifier', '>= 1.3.0'
gem 'will_paginate', '~> 3.0'
gem 'turbolinks', '< 5.0.0' # newer versions prevent loading ACE if the page containing is not accessed directly / refreshed
gem 'uglifier'
gem 'will_paginate'
gem 'tubesock'
gem 'faye-websocket'
gem 'eventmachine', '1.0.9.1' # explicitly added, this is used by faye-websocket, version 1.2.5 still has an error in eventmachine.rb:202: [BUG] Segmentation fault, which is not yet fixed and causes the whole ruby process to crash
gem 'nokogiri'
gem 'd3-rails'
gem 'rest-client'
@ -46,7 +47,7 @@ gem 'whenever', require: false
group :development, :staging do
gem 'better_errors', platform: :ruby
gem 'binding_of_caller', platform: :ruby
gem 'capistrano', '~> 3.3.0'
gem 'capistrano'
gem 'capistrano3-puma'
gem 'capistrano-rails'
gem 'capistrano-rvm'
@ -54,7 +55,7 @@ group :development, :staging do
gem 'rack-mini-profiler'
gem 'rubocop', require: false
gem 'rubocop-rspec'
gem 'web-console', '~> 2.0', platform: :ruby
gem 'web-console', platform: :ruby
end
group :development, :test, :staging do