From 8334baff99046438b97cdd80a0b1b689cd9bd2b8 Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Wed, 22 Nov 2017 14:58:44 +0100 Subject: [PATCH] Update gems --- Gemfile | 40 ++-- Gemfile.lock | 188 +++++++++--------- db/schema.rb | 2 +- .../admin/dashboard_controller_test.rb | 2 +- .../admin/translations_controller_test.rb | 2 +- test/controllers/problems_controller_test.rb | 2 +- .../translations_controller_test.rb | 2 +- 7 files changed, 114 insertions(+), 124 deletions(-) diff --git a/Gemfile b/Gemfile index 7ff9224..46c9fb6 100644 --- a/Gemfile +++ b/Gemfile @@ -4,48 +4,48 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.5' # Use sqlite3 as the database for Active Record -gem 'sqlite3' +gem 'sqlite3', '~> 1.3.13' # Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0.4' +gem 'sass-rails', '~> 5.0.7' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '~> 2.7.2' +gem 'uglifier', '~> 3.2.0' # Use CoffeeScript for .js.coffee assets and views -gem 'coffee-rails', '~> 4.1.0' +gem 'coffee-rails', '~> 4.2.2' # See https://github.com/sstephenson/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library -gem 'jquery-rails' +gem 'jquery-rails', '~> 4.3.1' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks' +gem 'turbolinks', '~> 5.0.1' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.3.1' +gem 'jbuilder', '~> 2.7.0' # bundle exec rake doc:rails generates the API under doc/api. -gem 'sdoc', '~> 0.4.0', group: :doc +gem 'sdoc', '~> 0.4.2', group: :doc gem 'web-console', '~> 2.0', group: :development -gem 'quiet_assets', group: :development +gem 'quiet_assets', '~> 1.1.0', group: :development # Use Coveralls for coverage documentation -gem 'coveralls', '~> 0.8.2', require: false +gem 'coveralls', '~> 0.8.21', require: false -gem 'bootstrap-sass', '~> 3.3.6' -gem 'autoprefixer-rails' +gem 'bootstrap-sass', '~> 3.3.7' +gem 'autoprefixer-rails', '~> 7.1.6' -gem 'bh', '~> 1.3.4' +gem 'bh', '~> 1.3.6' -gem 'will_paginate', '~> 3.0.7' -gem 'will-paginate-i18n' -gem 'will_paginate-bootstrap' +gem 'will_paginate', '~> 3.1.6' +gem 'will-paginate-i18n', '~> 0.1.15' +gem 'will_paginate-bootstrap', '~> 1.0.1' -gem 'mathjax-rails' +gem 'mathjax-rails', '~> 2.6.1' -gem 'devise', '~> 3.5.2' -gem 'devise-bootstrap-views' +gem 'devise', '~> 4.3.0' +gem 'devise-bootstrap-views', '~> 0.0.11' -gem 'codemirror-rails' +gem 'codemirror-rails', '~> 5.16.0' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' diff --git a/Gemfile.lock b/Gemfile.lock index 421dce7..ce2ec61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,80 +37,75 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.3) - autoprefixer-rails (6.1.1) + autoprefixer-rails (7.1.6) execjs - json - bcrypt (3.1.10) - bh (1.3.4) + bcrypt (3.1.11-x86-mingw32) + bh (1.3.6) actionpack activesupport binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - builder (3.2.2) - codemirror-rails (5.6) - railties (>= 3.0, < 5) - coffee-rails (4.1.0) + builder (3.2.3) + codemirror-rails (5.16.0) + railties (>= 3.0, < 6.0) + 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) - coveralls (0.8.9) - json (~> 1.8) - rest-client (>= 1.6.8, < 2) - simplecov (~> 0.10.0) + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + coveralls (0.8.21) + json (>= 1.8, < 3) + simplecov (~> 0.14.1) term-ansicolor (~> 1.3) - thor (~> 0.19.1) - tins (~> 1.6.0) + thor (~> 0.19.4) + tins (~> 1.6) + crass (1.0.3) debug_inspector (0.0.2) - devise (3.5.2) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 5.2) responders - thread_safe (~> 0.1) warden (~> 1.2.3) - devise-bootstrap-views (0.0.7) + devise-bootstrap-views (0.0.11) docile (1.1.5) - domain_name (0.5.25) - unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - execjs (2.6.0) - ffi (1.9.10) + execjs (2.7.0) globalid (0.3.6) activesupport (>= 4.1.0) - http-cookie (1.0.2) - domain_name (~> 0.5) - i18n (0.7.0) - jbuilder (2.3.2) - activesupport (>= 3.0.0, < 5) - multi_json (~> 1.2) - jquery-rails (4.0.5) - rails-dom-testing (~> 1.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) - loofah (2.0.3) + json (1.8.6) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) - mathjax-rails (2.5.1) + mathjax-rails (2.6.1) railties (>= 3.0) mime-types (2.99) - mini_portile (0.6.2) - minitest (5.8.3) - multi_json (1.11.2) - netrc (0.11.0) - nokogiri (1.6.6.4) - mini_portile (~> 0.6.0) + mini_portile2 (2.3.0) + minitest (5.10.3) + multi_json (1.12.2) + nokogiri (1.8.1-x86-mingw32) + mini_portile2 (~> 2.3.0) orm_adapter (0.5.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.4) + rack (1.6.8) rack-test (0.6.3) rack (>= 1.0) rails (4.2.5) @@ -126,68 +121,60 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) railties (4.2.5) actionpack (= 4.2.5) activesupport (= 4.2.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) - rdoc (4.2.0) - json (~> 1.4) - responders (2.1.0) - railties (>= 4.2.0, < 5) - rest-client (1.8.0) - ffi (~> 1.9) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) + rake (12.3.0) + rdoc (4.3.0) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) sass (3.4.19) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + 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 (0.4.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - simplecov (0.10.0) + simplecov (0.14.1) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) sprockets (3.4.1) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.11) - term-ansicolor (1.3.2) + sqlite3 (1.3.13-x86-mingw32) + term-ansicolor (1.6.0) tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.1) - tins (1.6.0) - turbolinks (2.5.3) - coffee-rails - tzinfo (1.2.2) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.8) + tins (1.15.1) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.4) thread_safe (~> 0.1) tzinfo-data (1.2015.7) tzinfo (>= 1.0.0) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.1) - warden (1.2.3) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + warden (1.2.7) rack (>= 1.0) web-console (2.2.1) activemodel (>= 4.0) @@ -195,7 +182,7 @@ GEM railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) will-paginate-i18n (0.1.15) - will_paginate (3.0.7) + will_paginate (3.1.6) will_paginate-bootstrap (1.0.1) will_paginate (>= 3.0.3) @@ -203,26 +190,29 @@ PLATFORMS x86-mingw32 DEPENDENCIES - autoprefixer-rails - bh (~> 1.3.4) - bootstrap-sass (~> 3.3.6) - codemirror-rails - coffee-rails (~> 4.1.0) - coveralls (~> 0.8.2) - devise (~> 3.5.2) - devise-bootstrap-views - jbuilder (~> 2.3.1) - jquery-rails - mathjax-rails - quiet_assets + autoprefixer-rails (~> 7.1.6) + bh (~> 1.3.6) + bootstrap-sass (~> 3.3.7) + codemirror-rails (~> 5.16.0) + coffee-rails (~> 4.2.2) + coveralls (~> 0.8.21) + devise (~> 4.3.0) + devise-bootstrap-views (~> 0.0.11) + jbuilder (~> 2.7.0) + jquery-rails (~> 4.3.1) + mathjax-rails (~> 2.6.1) + quiet_assets (~> 1.1.0) rails (= 4.2.5) - sass-rails (~> 5.0.4) - sdoc (~> 0.4.0) - sqlite3 - turbolinks + sass-rails (~> 5.0.7) + sdoc (~> 0.4.2) + sqlite3 (~> 1.3.13) + turbolinks (~> 5.0.1) tzinfo-data - uglifier (~> 2.7.2) + uglifier (~> 3.2.0) web-console (~> 2.0) - will-paginate-i18n - will_paginate (~> 3.0.7) - will_paginate-bootstrap + will-paginate-i18n (~> 0.1.15) + will_paginate (~> 3.1.6) + will_paginate-bootstrap (~> 1.0.1) + +BUNDLED WITH + 1.16.0 diff --git a/db/schema.rb b/db/schema.rb index 7990adf..ee93b97 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -40,7 +40,7 @@ ActiveRecord::Schema.define(version: 20150131103802) do add_index "problems", ["translation_id"], name: "index_problems_on_translation_id" create_table "translations", force: :cascade do |t| - t.string "title", limit: 255 + t.string "title" t.text "content" t.datetime "created_at" t.datetime "updated_at" diff --git a/test/controllers/admin/dashboard_controller_test.rb b/test/controllers/admin/dashboard_controller_test.rb index f6be4fb..07e43b7 100644 --- a/test/controllers/admin/dashboard_controller_test.rb +++ b/test/controllers/admin/dashboard_controller_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class Admin::DashboardControllerTest < ActionController::TestCase - include Devise::TestHelpers + include Devise::Test::ControllerHelpers setup do login diff --git a/test/controllers/admin/translations_controller_test.rb b/test/controllers/admin/translations_controller_test.rb index 6b58950..6c49289 100644 --- a/test/controllers/admin/translations_controller_test.rb +++ b/test/controllers/admin/translations_controller_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class Admin::TranslationsControllerTest < ActionController::TestCase - include Devise::TestHelpers + include Devise::Test::ControllerHelpers setup do login diff --git a/test/controllers/problems_controller_test.rb b/test/controllers/problems_controller_test.rb index e553fa6..a81ce52 100644 --- a/test/controllers/problems_controller_test.rb +++ b/test/controllers/problems_controller_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class ProblemsControllerTest < ActionController::TestCase - include Devise::TestHelpers + include Devise::Test::ControllerHelpers test "should get index" do get :index diff --git a/test/controllers/translations_controller_test.rb b/test/controllers/translations_controller_test.rb index dc91bdb..cc6e295 100644 --- a/test/controllers/translations_controller_test.rb +++ b/test/controllers/translations_controller_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class TranslationsControllerTest < ActionController::TestCase - include Devise::TestHelpers + include Devise::Test::ControllerHelpers setup do @update = {