Merge pull request #149 from openHPI/update-gemfile

Update gemfile
This commit is contained in:
rteusner
2018-02-20 16:33:57 +01:00
committed by GitHub
15 changed files with 338 additions and 317 deletions

View File

@ -5,8 +5,9 @@ services:
addons:
code_climate:
repo_token: 53a2c2608c848714e96f6a1fc0365dcfdfec051f7827d50cea965ea625f49734
postgresql: "9.5"
repo_token:
secure: "cZoMNjQKB/D7W4B7JDk9PXooy2WCDypu7R4C/Vi0DziZCU9HRwLbdt9aoH5hgHFa7Fe2rHFgflPAAP7h698ozvP0waFtPqLAj+PbEt27LbBDvW8JcvNkKXA0rj5wyTkzuc/0kD+kPB4oDXMak6gZlB9HCJDsa3kdXScQGTVuPdU="
postgresql: "9.6"
before_install:
- export DISPLAY=:99.0
@ -32,11 +33,9 @@ before_script:
cache: bundler
language: ruby
rvm:
- 2.3.1
# - 2.1.5
# - 2.2.1
- 2.3.6
script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper --tag ~docker
script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper --tag ~docker && bundle exec codeclimate-test-reporter
# one of the solutions I've found
# - sudo docker run --rm=true -v `pwd`:/ansible-apache:rw weldpua2008/docker-ansible:${OS_TYPE}${OS_VERSION}_v${ANSIBLE_VERSION} /bin/bash -c "/ansible-apache/tests/test-in-docker-image.sh ${OS_TYPE} ${OS_VERSION} ${ANSIBLE_VERSION}"

View File

@ -5,3 +5,6 @@ require 'capistrano/puma/nginx'
require 'capistrano/rails'
require 'capistrano/rvm'
require 'capistrano/upload-config'
install_plugin Capistrano::Puma
install_plugin Capistrano::Puma::Nginx

40
Gemfile
View File

@ -1,40 +1,40 @@
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.0'
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 'nokogiri'
@ -45,7 +45,7 @@ gem 'rubyzip'
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'
@ -53,7 +53,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

View File

@ -1,378 +1,387 @@
GEM
remote: https://rubygems.org/
specs:
ZenTest (4.11.0)
actionmailer (4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
ZenTest (4.11.1)
actionmailer (4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5)
actionview (= 4.2.5)
activesupport (= 4.2.5)
actionpack (4.2.10)
actionview (= 4.2.10)
activesupport (= 4.2.10)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5)
activesupport (= 4.2.5)
actionview (4.2.10)
activesupport (= 4.2.10)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5)
activesupport (= 4.2.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.10)
activesupport (= 4.2.10)
globalid (>= 0.3.0)
activemodel (4.2.5)
activesupport (= 4.2.5)
activemodel (4.2.10)
activesupport (= 4.2.10)
builder (~> 3.1)
activerecord (4.2.5)
activemodel (= 4.2.5)
activesupport (= 4.2.5)
activerecord (4.2.10)
activemodel (= 4.2.10)
activesupport (= 4.2.10)
arel (~> 6.0)
activerecord-jdbc-adapter (1.3.19)
activerecord-jdbc-adapter (50.0)
activerecord (>= 2.2)
activerecord-jdbcpostgresql-adapter (1.3.19)
activerecord-jdbc-adapter (~> 1.3.19)
jdbc-postgres (>= 9.1)
activesupport (4.2.5)
activerecord-jdbcpostgresql-adapter (50.0)
activerecord-jdbc-adapter (~> 50.0)
jdbc-postgres (>= 9.4, < 43)
activesupport (4.2.10)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
airbrussh (1.3.0)
sshkit (>= 1.6.1, != 1.7.0)
arel (6.0.4)
ast (2.3.0)
ast (2.4.0)
autotest-rails (4.2.1)
ZenTest (~> 4.5)
bcrypt (3.1.10)
bcrypt (3.1.10-java)
better_errors (2.1.1)
bcrypt (3.1.11)
bcrypt (3.1.11-java)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootstrap-will_paginate (0.0.10)
bootstrap-will_paginate (1.0.0)
will_paginate
bootstrap_pagedown (1.1.0)
rails (>= 3.2)
builder (3.2.2)
byebug (8.2.2)
capistrano (3.3.5)
capistrano-stats (~> 1.1.0)
builder (3.2.3)
byebug (10.0.0)
capistrano (3.10.1)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
capistrano-bundler (1.1.4)
sshkit (>= 1.9.0)
capistrano-bundler (1.3.0)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-rails (1.1.6)
capistrano-rails (1.3.1)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano-stats (1.1.1)
capistrano-upload-config (0.7.0)
capistrano-upload-config (0.8.2)
capistrano (>= 3.0)
capistrano3-puma (1.2.1)
capistrano (~> 3.0)
puma (>= 2.6)
capybara (2.6.2)
capistrano3-puma (3.1.1)
capistrano (~> 3.7)
capistrano-bundler
puma (~> 3.4)
capybara (2.18.0)
addressable
mime-types (>= 1.16)
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
carrierwave (0.10.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
xpath (>= 2.0, < 4.0)
carrierwave (1.2.2)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
childprocess (0.5.9)
childprocess (0.8.0)
ffi (~> 1.0, >= 1.0.11)
codeclimate-test-reporter (0.4.8)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.0)
coffee-rails (4.0.1)
codeclimate-test-reporter (1.0.7)
simplecov
coderay (1.1.2)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
concurrent-ruby (1.0.2-java)
concurrent-ruby-ext (1.0.2)
concurrent-ruby (~> 1.0.2)
d3-rails (3.5.11)
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.0.5-java)
concurrent-ruby-ext (1.0.5)
concurrent-ruby (= 1.0.5)
crass (1.0.3)
d3-rails (4.10.2)
railties (>= 3.1)
database_cleaner (1.5.1)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
diff-lcs (1.3)
docile (1.1.5)
docker-api (1.25.0)
excon (>= 0.38.0)
json
domain_name (0.5.25)
docker-api (1.34.0)
excon (>= 0.47.0)
multi_json
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubi (1.7.0)
erubis (2.7.0)
eventmachine (1.0.9.1)
eventmachine (1.0.9.1-java)
excon (0.54.0)
execjs (2.6.0)
eventmachine (1.2.5)
eventmachine (1.2.5-java)
excon (0.60.0)
execjs (2.7.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
factory_bot_rails (4.8.2)
factory_bot (~> 4.8.2)
railties (>= 3.0.0)
faraday (0.9.2)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
faye-websocket (0.10.2)
faye-websocket (0.10.7)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.9.10)
ffi (1.9.10-java)
forgery (0.6.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
highline (1.7.8)
hike (1.2.3)
http-cookie (1.0.2)
ffi (1.9.21)
ffi (1.9.21-java)
forgery (0.7.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.7.0)
ims-lti (1.1.10)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
ims-lti (1.1.13)
builder
oauth (~> 0.4.5)
jbuilder (2.4.1)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jdbc-postgres (9.4.1206)
jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
oauth (>= 0.4.5, < 0.6)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jdbc-postgres (42.1.4)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (1.8.3)
json (1.8.3-java)
jwt (1.5.1)
kramdown (1.9.0)
loofah (2.0.3)
json (2.1.0)
json (2.1.0-java)
jwt (1.5.6)
kramdown (1.16.2)
loofah (2.2.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (2.99.3)
mini_portile2 (2.1.0)
minitest (5.10.1)
multi_json (1.12.1)
multi_xml (0.5.5)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.0.2)
netrc (0.10.3)
newrelic_rpm (3.14.3.313)
nokogiri (1.7.0.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.7.0.1-java)
nyan-cat-formatter (0.11)
net-ssh (4.2.0)
netrc (0.11.0)
newrelic_rpm (4.8.0.341)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
nokogiri (1.8.2-java)
nyan-cat-formatter (0.12.0)
rspec (>= 2.99, >= 2.14.2, < 4)
oauth (0.4.7)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0, < 1.5.2)
oauth (0.5.4)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
pagedown-rails (1.1.4)
railties (> 3.1)
parser (2.3.3.1)
ast (~> 2.2)
pg (0.18.4)
polyamorous (1.3.0)
parallel (1.12.1)
parser (2.5.0.0)
ast (~> 2.4.0)
pg (0.21.0)
polyamorous (1.3.3)
activerecord (>= 3.0)
powerpack (0.1.1)
pry (0.10.3)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry (0.10.3-java)
method_source (~> 0.9.0)
pry (0.11.3-java)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
method_source (~> 0.9.0)
spoon (~> 0.0)
pry-byebug (3.3.0)
byebug (~> 8.0)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
puma (2.15.3)
puma (2.15.3-java)
public_suffix (3.0.2)
puma (3.11.2)
puma (3.11.2-java)
pundit (1.1.0)
activesupport (>= 3.0.0)
rack (1.6.5)
rack-mini-profiler (0.10.1)
rack (1.6.8)
rack-mini-profiler (0.10.7)
rack (>= 1.2.0)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5)
actionmailer (= 4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
activemodel (= 4.2.5)
activerecord (= 4.2.5)
activesupport (= 4.2.5)
rails (4.2.10)
actionmailer (= 4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
activemodel (= 4.2.10)
activerecord (= 4.2.10)
activesupport (= 4.2.10)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5)
railties (= 4.2.10)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-i18n (4.0.8)
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
railties (4.2.5)
actionpack (= 4.2.5)
activesupport (= 4.2.5)
railties (4.2.10)
actionpack (= 4.2.10)
activesupport (= 4.2.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.1)
rake (12.0.0)
ransack (1.7.0)
rainbow (3.0.0)
rake (12.3.0)
ransack (1.8.7)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.2)
rdoc (4.2.2)
json (~> 1.4)
rest-client (1.8.0)
polyamorous (~> 1.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdoc (6.0.1)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-autotest (1.0.0)
rspec-core (>= 2.99.0.beta1, < 4.0.0)
rspec-core (3.4.4)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.1)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-rails (3.4.2)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
rubocop (0.46.0)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-rspec (1.9.0)
rubocop (>= 0.42.0)
ruby-progressbar (1.8.1)
rubytree (0.9.7)
json (~> 1.8)
structured_warnings (~> 0.2)
rubyzip (1.1.7)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
selenium-webdriver (2.52.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
simplecov (0.11.2)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slim (3.0.6)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
sorcery (0.9.1)
bcrypt (~> 3.1)
oauth (~> 0.4, >= 0.4.4)
oauth2 (>= 0.8.0)
spoon (0.0.4)
ffi
spring (1.6.3)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.3.3)
rspec-support (~> 3.7.0)
rspec-rails (3.7.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rubocop (0.52.1)
parallel (~> 1.10)
parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-rspec (1.22.2)
rubocop (>= 0.52.1)
ruby-progressbar (1.9.0)
rubytree (1.0.0)
json (~> 2.1)
structured_warnings (~> 0.3)
rubyzip (1.2.1)
sass (3.5.5)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sshkit (1.8.1)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (1.0.0)
rdoc (>= 5.0)
selenium-webdriver (3.9.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
simplecov (0.15.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slim (3.0.9)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
sorcery (0.11.0)
bcrypt (~> 3.1)
oauth (~> 0.4, >= 0.4.4)
oauth2 (~> 1.0, >= 0.8.0)
spoon (0.0.6)
ffi
spring (2.0.2)
activesupport (>= 4.2)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sshkit (1.16.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
structured_warnings (0.2.0)
temple (0.7.6)
thor (0.19.4)
thread_safe (0.3.5)
thread_safe (0.3.5-java)
tilt (1.4.1)
tubesock (0.2.5)
structured_warnings (0.3.0)
temple (0.8.0)
thor (0.20.0)
thread_safe (0.3.6)
thread_safe (0.3.6-java)
tilt (2.0.8)
tubesock (0.2.7)
rack (>= 1.5.0)
websocket (>= 1.1.0)
turbolinks (2.5.3)
turbolinks (2.5.4)
coffee-rails
tzinfo (1.2.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
uglifier (4.1.6)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf (0.1.4-java)
unf_ext (0.0.7.1)
unicode-display_width (1.1.2)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
websocket (1.2.2)
websocket-driver (0.6.3)
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
web-console (3.3.0)
activemodel (>= 4.2)
debug_inspector
railties (>= 4.2)
websocket (1.2.5)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-driver (0.6.3-java)
websocket-driver (0.7.0-java)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
will_paginate (3.1.0)
xpath (2.0.0)
nokogiri (~> 1.3)
websocket-extensions (0.1.3)
will_paginate (3.1.6)
xpath (3.0.0)
nokogiri (~> 1.8)
PLATFORMS
java
@ -381,13 +390,13 @@ PLATFORMS
DEPENDENCIES
activerecord-jdbcpostgresql-adapter
autotest-rails
bcrypt (~> 3.1.7)
bcrypt
better_errors
binding_of_caller
bootstrap-will_paginate
bootstrap_pagedown
byebug
capistrano (~> 3.3.0)
capistrano
capistrano-rails
capistrano-rvm
capistrano-upload-config
@ -395,32 +404,32 @@ DEPENDENCIES
capybara
carrierwave
codeclimate-test-reporter
coffee-rails (~> 4.0.0)
concurrent-ruby (~> 1.0.1)
concurrent-ruby-ext (~> 1.0.1)
coffee-rails
concurrent-ruby
concurrent-ruby-ext
d3-rails
database_cleaner
docker-api (~> 1.25.0)
factory_bot_rails (~> 4.8.2)
docker-api
factory_bot_rails
faye-websocket
forgery
highline
ims-lti
jbuilder (~> 2.0)
ims-lti (~> 1.1.0)
jbuilder
jquery-rails
jquery-turbolinks
kramdown
newrelic_rpm
nokogiri
nyan-cat-formatter
pagedown-rails (~> 1.1.4)
pg
pagedown-rails
pg (< 1.0)
pry-byebug
puma (~> 2.15.3)
puma
pundit
rack-mini-profiler
rails (= 4.2.5)
rails-i18n (~> 4.0.0)
rails (= 4.2.10)
rails-i18n
rake
ransack
rest-client
@ -430,8 +439,8 @@ DEPENDENCIES
rubocop-rspec
rubytree
rubyzip
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
sass-rails
sdoc
selenium-webdriver
simplecov
slim
@ -439,7 +448,10 @@ DEPENDENCIES
spring
thread_safe
tubesock
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
will_paginate (~> 3.0)
turbolinks (< 5.0.0)
uglifier
web-console
will_paginate
BUNDLED WITH
1.16.1

View File

@ -26,4 +26,4 @@
//= require markdown.converter
//= require markdown.sanitizer
//= require markdown.editor
//= require ../../../vendor/assets/javascripts/ace/ext-language_tools
//= require ace/ext-language_tools

View File

@ -3,7 +3,7 @@
}
.chosen-container {
width: 100% !important;
width: 250px !important;
}
.code-field {

View File

@ -35,6 +35,9 @@ Rails.application.configure do
# yet still be able to expire them through the digest params.
config.assets.digest = true
# Suppress logger output for asset requests.
config.assets.quiet = true
# Adds additional error checking when serving assets at runtime.
# Checks for improperly declared sprockets dependencies.
# Raises helpful error messages.

View File

@ -13,7 +13,7 @@ add-apt-repository ppa:chris-lea/node.js
apt-get update
# code_ocean
apt-get install -y postgresql-client postgresql-9.5 postgresql-server-dev-9.5 vagrant
apt-get install -y postgresql-client postgresql-10 postgresql-server-dev-10 vagrant
# Docker
if [ ! -f /etc/default/docker ]
@ -49,18 +49,18 @@ apt-get install -y libgdbm-dev libncurses5-dev automake libtool bison libffi-dev
gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
curl -L https://get.rvm.io | bash -s stable
source /etc/profile.d/rvm.sh
rvm install 2.3.1
rvm use 2.3.1 --default
rvm install 2.3.6
rvm use 2.3.6 --default
ruby -v
# rails
apt-get -y install nodejs
gem install rails -v 4.2.1
gem install rails -v 4.2.10
# drop postgres access control
if ! grep -q code_ocean /etc/postgresql/9.5/main/pg_hba.conf
if ! grep -q code_ocean /etc/postgresql/10/main/pg_hba.conf
then
cat >/etc/postgresql/9.3/main/pg_hba.conf <<EOF
cat >/etc/postgresql/10/main/pg_hba.conf <<EOF
# code_ocean: drop access control
local all all trust
host all all 127.0.0.1/32 trust
@ -110,7 +110,7 @@ passenger_root /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini;
server {
server_name codeocean.local;
root /vagrant/public;
passenger_ruby /usr/local/rvm/gems/ruby-2.1.5/wrappers/ruby;
passenger_ruby /usr/local/rvm/gems/ruby-2.3.6/wrappers/ruby;
passenger_sticky_sessions on;
passenger_enabled on;
passenger_app_env development;

View File

@ -16,13 +16,8 @@
# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
unless RUBY_PLATFORM == 'java'
if ENV['CODECLIMATE_REPO_TOKEN']
require 'codeclimate-test-reporter'
CodeClimate::TestReporter.start
else
require 'simplecov'
SimpleCov.start('rails')
end
end
RSpec.configure do |config|

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long