diff --git a/Gemfile.lock b/Gemfile.lock index 87a1e3c..f047254 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/refile/refile.git - revision: e910f5ca5a9060c307bd0a5e813f1fec73219ed5 + revision: e690bf5c2d83b3dfd805764d54e8f5daf14993b0 specs: refile (0.7.0) mime-types @@ -50,13 +50,13 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - airbrussh (1.3.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + airbrussh (1.3.4) sshkit (>= 1.6.1, != 1.7.0) arel (9.0.0) ast (2.4.0) - autoprefixer-rails (9.6.1) + autoprefixer-rails (9.6.1.1) execjs awesome_print (1.8.0) bcrypt (3.1.13) @@ -66,7 +66,7 @@ GEM rack (>= 0.9.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.4.4) + bootsnap (1.4.5) msgpack (~> 1.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) @@ -77,7 +77,7 @@ GEM railties (>= 3.1) builder (3.2.3) byebug (11.0.1) - capistrano (3.11.0) + capistrano (3.11.2) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -94,7 +94,7 @@ GEM capistrano (~> 3.7) capistrano-bundler puma (~> 4.0) - capybara (3.26.0) + capybara (3.29.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -102,12 +102,14 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.5) xpath (~> 3.2) - carrierwave (1.3.1) - activemodel (>= 4.0.0) - activesupport (>= 4.0.0) - mime-types (>= 1.16) - childprocess (1.0.1) - rake (< 13.0) + carrierwave (2.0.2) + activemodel (>= 5.0.0) + activesupport (>= 5.0.0) + addressable (~> 2.6) + image_processing (~> 1.1) + mimemagic (>= 0.3.0) + mini_mime (>= 0.1.3) + childprocess (3.0.0) choice (0.2.0) chronic (0.10.2) chunky_png (1.3.11) @@ -127,26 +129,26 @@ GEM debug_inspector (0.0.3) delorean (2.1.0) chronic - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.8.0) + devise-i18n (1.8.2) devise (>= 4.6) diff-lcs (1.3) docile (1.3.2) - erubi (1.8.0) + erubi (1.9.0) execjs (2.7.0) - factory_bot (5.0.2) + factory_bot (5.1.1) activesupport (>= 4.2.0) - factory_bot_rails (5.0.2) - factory_bot (~> 5.0.2) + factory_bot_rails (5.1.1) + factory_bot (~> 5.1.0) railties (>= 4.2.0) - faker (1.9.6) - i18n (>= 0.7) - faraday (0.15.4) + faker (2.5.0) + i18n (~> 1.6.0) + faraday (0.16.2) multipart-post (>= 1.2, < 3) ffi (1.11.1) font-awesome-sass (4.6.2) @@ -158,7 +160,7 @@ GEM activemodel (>= 4.2, < 6.1) activerecord (>= 4.2, < 6.1) request_store (~> 1.0) - guard (2.15.0) + guard (2.15.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -185,8 +187,8 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - image_processing (1.9.0) - mini_magick (>= 4.9.3, < 5) + image_processing (1.9.3) + mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.13, < 3) jaro_winkler (1.5.3) jbuilder (2.9.1) @@ -202,11 +204,10 @@ GEM thor (>= 0.14, < 2.0) json (2.2.0) libv8 (7.3.492.27.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.2.3) + listen (3.2.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.3.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) @@ -215,19 +216,19 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mime-types (3.2.2) + mime-types (3.3) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) + mime-types-data (3.2019.0904) mimemagic (0.3.3) mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) mini_racer (0.2.6) libv8 (>= 6.9.411) - minitest (5.11.3) + minitest (5.12.2) morrisjs-rails (0.5.1.2) railties (> 3.1, < 6) - msgpack (1.3.0) + msgpack (1.3.1) multipart-post (2.1.1) mustermann (1.0.3) nenv (0.3.0) @@ -235,15 +236,15 @@ GEM net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) - nio4r (2.4.0) - nokogiri (1.10.3) + nio4r (2.5.2) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) - notiffany (0.1.1) + notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) parallel (1.17.0) - parser (2.6.3.0) + parser (2.6.5.0) ast (~> 2.4.0) pg (1.1.4) phony (2.15.49) @@ -255,11 +256,11 @@ GEM method_source (~> 0.9.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (3.1.1) - puma (4.0.1) + public_suffix (4.0.1) + puma (4.2.0) nio4r (~> 2.0) rack (2.0.7) - rack-protection (2.0.5) + rack-protection (2.0.7) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -284,7 +285,7 @@ GEM activesupport (>= 4.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rails-i18n (5.1.3) i18n (>= 0.7, < 2) @@ -296,7 +297,7 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.2) + rake (13.0.0) raphael-rails (2.1.2) rb-fsevent (0.10.3) rb-inotify (0.10.0) @@ -310,18 +311,20 @@ GEM responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) - rqrcode (0.10.1) + rqrcode (1.1.1) chunky_png (~> 1.0) + rqrcode_core (~> 0.1.0) + rqrcode_core (0.1.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) rspec-core (3.8.2) rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rspec-expectations (3.8.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-mocks (3.8.1) + rspec-mocks (3.8.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-rails (3.8.2) @@ -332,7 +335,7 @@ GEM rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) - rspec-support (3.8.2) + rspec-support (3.8.3) rubocop (0.72.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -340,45 +343,45 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-performance (1.4.0) + rubocop-performance (1.4.1) rubocop (>= 0.71.0) ruby-graphviz (1.2.4) ruby-progressbar (1.10.1) - ruby-vips (2.0.14) + ruby-vips (2.0.15) ffi (~> 1.9) - ruby_dep (1.5.0) - rubyzip (1.2.3) + rubyzip (2.0.0) sass (3.7.4) 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) - sassc (2.0.1) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.2.1) ffi (~> 1.9) - rake + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt search_object (1.2.2) - selenium-webdriver (3.142.3) - childprocess (>= 0.5, < 2.0) - rubyzip (~> 1.2, >= 1.2.2) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) shellany (0.0.1) - simple_form (4.1.0) + simple_form (5.0.0) actionpack (>= 5.0) activemodel (>= 5.0) - simplecov (0.17.0) + simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sinatra (2.0.5) + sinatra (2.0.7) mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.5) + rack-protection (= 2.0.7) tilt (~> 2.0) slim (4.0.1) temple (>= 0.7.6, < 0.9) @@ -398,21 +401,21 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.1) - sshkit (1.19.1) + sshkit (1.20.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - standard (0.1.0) + standard (0.1.4) rubocop (~> 0.72.0) rubocop-performance (~> 1.4.0) - temple (0.8.1) + temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.9) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.20) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (1.6.0) warden (1.2.8) diff --git a/config/deploy.rb b/config/deploy.rb index f4c546e..b15e5ab 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid only for current version of Capistrano -lock "3.11.0" +lock "3.11.2" set :application, "clarion" set :repo_url, "https://github.com/ignisf/clarion.git" @@ -39,7 +39,7 @@ set :linked_dirs, fetch(:linked_dirs, []).push("log", "tmp/uploads", "tmp/pids", # Default value for keep_releases is 5 set :keep_releases, 5 -set :rvm_ruby_version, "2.6.3" +set :rvm_ruby_version, "2.6.5" set :puma_bind, ["tcp://127.0.0.1:9087"] set :puma_init_active_record, true