From ec9f192128369563c722f61f04e7c39499388e93 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Sat, 10 Nov 2018 18:08:15 +0200 Subject: [PATCH] Update a few more broken deps --- Gemfile | 2 +- Gemfile.lock | 119 ++++++++++++++++++++++++++------------------------- 2 files changed, 62 insertions(+), 59 deletions(-) diff --git a/Gemfile b/Gemfile index d78616d..586a4f6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.2.6' +gem 'rails', '~> 4.2.6' gem 'sqlite3' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 406d249..6cbe9a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,45 +1,44 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + 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.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + 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.6) - activesupport (= 4.2.6) + 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.6) - activesupport (= 4.2.6) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.6) + 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) airbrussh (1.1.1) sshkit (>= 1.6.1, != 1.7.0) - arel (6.0.3) + arel (6.0.4) ast (2.3.0) autoprefixer-rails (6.5.1) execjs @@ -58,7 +57,7 @@ GEM rails (>= 3.1.0) bootswatch-rails (3.3.5) railties (>= 3.1) - builder (3.2.2) + builder (3.2.3) capistrano (3.6.1) airbrussh (>= 1.0.0) capistrano-harrow @@ -98,9 +97,10 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.2) + concurrent-ruby (1.1.3) copy_carrierwave_file (1.3.0) carrierwave (>= 0.9) + crass (1.0.4) debug_inspector (0.0.2) devise (4.2.0) bcrypt (~> 3.0) @@ -132,8 +132,8 @@ GEM font-awesome-sass (4.6.2) sass (>= 3.2) formatador (0.2.5) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) globalize (5.0.1) activemodel (>= 4.2.0, < 4.3) activerecord (>= 4.2.0, < 4.3) @@ -155,7 +155,8 @@ GEM hirb (0.7.3) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) i18n-tasks (0.9.5) activesupport (>= 4.0.2) ast (>= 2.1.0) @@ -178,25 +179,27 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.6) + json (2.1.0) libv8 (6.7.288.46.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.10) - mail (2.6.4) - mime-types (>= 1.16, < 4) + mail (2.7.1) + mini_mime (>= 0.1.1) method_source (0.8.2) mime-types (2.99.3) mimemagic (0.3.2) mini_magick (4.5.1) - mini_portile2 (2.1.0) + mini_mime (1.0.1) + mini_portile2 (2.3.0) mini_racer (0.2.4) libv8 (>= 6.3) - minitest (5.9.1) + minitest (5.11.3) morrisjs-rails (0.5.1) railties (> 3.1, < 5) multi_json (1.12.1) @@ -207,8 +210,8 @@ GEM net-ssh (>= 2.6.5) net-ssh (3.2.0) netrc (0.11.0) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -229,44 +232,44 @@ GEM puma (3.10.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.4) + rack (1.6.11) rack-protection (1.5.3) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + 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.6) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) rails-erd (1.5.0) activerecord (>= 3.2) activesupport (>= 3.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.3.0) + rake (12.3.1) raphael-rails (2.1.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) @@ -343,10 +346,10 @@ GEM activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.7.0) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -359,12 +362,12 @@ GEM tins (~> 1.0) terminal-table (1.7.3) unicode-display_width (~> 1.1.1) - thor (0.19.1) + thor (0.20.3) thread (0.2.2) - thread_safe (0.3.5) + thread_safe (0.3.6) tilt (2.0.5) tins (1.12.0) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (3.0.2) execjs (>= 0.3.0, < 3) @@ -419,7 +422,7 @@ DEPENDENCIES pry-rails puma quiet_assets - rails (= 4.2.6) + rails (~> 4.2.6) rails-erd rails-i18n raphael-rails