From f5293c447724b0eca0ed9563a5ec94956551249d Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Sun, 18 Feb 2018 19:46:59 +0100 Subject: [PATCH] Downgrade turbolinks and another bundle update --- Gemfile | 34 ++--- Gemfile.lock | 210 +++++++++++++------------- app/assets/javascripts/application.js | 2 +- 3 files changed, 124 insertions(+), 122 deletions(-) diff --git a/Gemfile b/Gemfile index 4590d3b8..d17b9907 100644 --- a/Gemfile +++ b/Gemfile @@ -1,17 +1,17 @@ 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','~> 1.25.0', 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', '~> 1.1.0' @@ -19,22 +19,22 @@ gem 'kramdown' gem 'newrelic_rpm' 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.1.0' +gem 'uglifier' +gem 'will_paginate' gem 'tubesock' gem 'faye-websocket' gem 'nokogiri' @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index a924c491..30d5a3a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,43 +2,42 @@ GEM remote: https://rubygems.org/ specs: ZenTest (4.11.1) - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + 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 (50.0) activerecord (>= 2.2) activerecord-jdbcpostgresql-adapter (50.0) activerecord-jdbc-adapter (~> 50.0) jdbc-postgres (>= 9.4, < 43) - activesupport (4.2.5) + 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) @@ -61,7 +60,7 @@ GEM bootstrap_pagedown (1.1.0) rails (>= 3.2) builder (3.2.3) - byebug (9.1.0) + byebug (10.0.0) capistrano (3.3.5) capistrano-stats (~> 1.1.0) i18n @@ -82,7 +81,7 @@ GEM capistrano3-puma (1.2.1) capistrano (~> 3.0) puma (>= 2.6) - capybara (2.17.0) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) @@ -98,9 +97,9 @@ GEM codeclimate-test-reporter (1.0.7) simplecov coderay (1.1.2) - coffee-rails (4.0.1) + 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 @@ -137,16 +136,15 @@ GEM faye-websocket (0.10.7) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.9.18) - ffi (1.9.18-java) + 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) - hike (1.2.3) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (0.9.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) ims-lti (1.1.13) builder @@ -162,11 +160,11 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks - json (1.8.6) - json (1.8.6-java) + json (2.1.0) + json (2.1.0-java) jwt (1.5.6) kramdown (1.16.2) - loofah (2.1.1) + loofah (2.2.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -185,7 +183,7 @@ GEM net-ssh (>= 2.6.5) net-ssh (4.2.0) netrc (0.11.0) - newrelic_rpm (4.7.1.340) + newrelic_rpm (4.8.0.341) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) nokogiri (1.8.2-java) @@ -201,8 +199,8 @@ GEM pagedown-rails (1.1.4) railties (> 3.1) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) + parser (2.5.0.0) + ast (~> 2.4.0) pg (0.21.0) polyamorous (1.3.3) activerecord (>= 3.0) @@ -214,12 +212,12 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) spoon (~> 0.0) - pry-byebug (3.5.1) - byebug (~> 9.1) + pry-byebug (3.6.0) + byebug (~> 10.0) pry (~> 0.10) - public_suffix (3.0.1) - 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.8) @@ -227,16 +225,16 @@ GEM 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) @@ -249,20 +247,23 @@ GEM 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 (3.0.0) rake (12.3.0) - ransack (1.8.6) + ransack (1.8.7) actionpack (>= 3.0) activerecord (>= 3.0) activesupport (>= 3.0) i18n polyamorous (~> 1.3.2) - rdoc (4.3.0) + 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, < 4.0) @@ -297,25 +298,29 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.22.1) + rubocop-rspec (1.22.2) rubocop (>= 0.52.1) ruby-progressbar (1.9.0) - rubytree (0.9.7) - json (~> 1.8) - structured_warnings (~> 0.2) + rubytree (1.0.0) + json (~> 2.1) + structured_warnings (~> 0.3) rubyzip (1.2.1) - 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.2) - json (~> 1.7, >= 1.7.7) - rdoc (~> 4.0) - selenium-webdriver (3.8.0) + 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) + 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.0) + rubyzip (~> 1.2) simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) @@ -332,16 +337,14 @@ GEM ffi spring (2.0.2) activesupport (>= 4.2) - 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) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - sshkit (1.15.1) + 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.3.0) @@ -349,27 +352,26 @@ GEM thor (0.20.0) thread_safe (0.3.6) thread_safe (0.3.6-java) - tilt (1.4.1) + tilt (2.0.8) tubesock (0.2.7) rack (>= 1.5.0) websocket (>= 1.1.0) - turbolinks (5.1.0) - turbolinks-source (~> 5.1) + turbolinks (5.0.1) + turbolinks-source (~> 5) turbolinks-source (5.1.0) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.5) + 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.4) + unf_ext (0.0.7.5) unicode-display_width (1.3.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.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) @@ -387,7 +389,7 @@ PLATFORMS DEPENDENCIES activerecord-jdbcpostgresql-adapter autotest-rails - bcrypt (~> 3.1.7) + bcrypt better_errors binding_of_caller bootstrap-will_paginate @@ -401,32 +403,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) + factory_bot_rails faye-websocket forgery highline ims-lti (~> 1.1.0) - jbuilder (~> 2.0) + jbuilder jquery-rails jquery-turbolinks kramdown newrelic_rpm nokogiri nyan-cat-formatter - pagedown-rails (~> 1.1.4) + 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 @@ -436,8 +438,8 @@ DEPENDENCIES rubocop-rspec rubytree rubyzip - sass-rails (~> 4.0.3) - sdoc (~> 0.4.0) + sass-rails + sdoc selenium-webdriver simplecov slim @@ -445,10 +447,10 @@ DEPENDENCIES spring thread_safe tubesock - turbolinks - uglifier (>= 1.3.0) - web-console (~> 2.0) - will_paginate (~> 3.0) + turbolinks (< 5.1.0) + uglifier + web-console + will_paginate BUNDLED WITH 1.16.1 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 533a8a9b..9ccb9815 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -26,4 +26,4 @@ //= require markdown.converter //= require markdown.sanitizer //= require markdown.editor -//= require ../../../vendor/assets/javascripts/ace/ext-language_tools \ No newline at end of file +//= require ace/ext-language_tools \ No newline at end of file