From 074a4be38f5a4aa10ec6cf6975d7b130804008dd Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 20 Jan 2018 17:47:56 -0600 Subject: [PATCH] Update gems. --- Gemfile | 2 +- Gemfile.lock | 204 ++++++++++++++++++++++++++------------------------- 2 files changed, 105 insertions(+), 101 deletions(-) diff --git a/Gemfile b/Gemfile index 56eae365b..bc74f6aaa 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem "sanitize" gem 'rmagick' gem 'net-sftp' gem 'term-ansicolor', :require => "term/ansicolor" -gem 'diff-lcs', :require => "diff/lcs/array", :git => "https://github.com/halostatue/diff-lcs.git" +gem 'diff-lcs', :require => "diff/lcs/array" gem 'bcrypt-ruby', :require => "bcrypt" gem 'statistics2' gem 'capistrano', '~> 3.4.0' diff --git a/Gemfile.lock b/Gemfile.lock index 5496e0b16..f1b75bfea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,15 +7,9 @@ GIT google-api-client (~> 0.9.3) googleauth (~> 0.5.0) -GIT - remote: https://github.com/halostatue/diff-lcs.git - revision: ff796c262db5a22f14b4765c09655b4faccc132a - specs: - diff-lcs (1.3) - GIT remote: https://github.com/r888888888/dtext_rb.git - revision: ebeb807f4a33fb212d306ef90e1bc113b3533c25 + revision: 89d56e932c4b195b0f9e89fffe7eb385332bcf8c specs: dtext_rb (1.6.1) nokogiri (~> 1.8) @@ -67,26 +61,26 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (6.0.4) - awesome_print (1.7.0) - aws-sdk (2.7.4) - aws-sdk-resources (= 2.7.4) - aws-sdk-core (2.7.4) + awesome_print (1.8.0) + aws-sdk (2.10.122) + aws-sdk-resources (= 2.10.122) + aws-sdk-core (2.10.122) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.4) - aws-sdk-core (= 2.7.4) - aws-sigv4 (1.0.0) - bcrypt (3.1.10) - bcrypt (3.1.10-x64-mingw32) + aws-sdk-resources (2.10.122) + aws-sdk-core (= 2.10.122) + aws-sigv4 (1.0.2) + bcrypt (3.1.11) + bcrypt (3.1.11-x64-mingw32) bcrypt-ruby (3.1.5) bcrypt (>= 3.1.3) bcrypt-ruby (3.1.5-x64-mingw32) bcrypt (>= 3.1.3) - bootsnap (1.0.0) + bootsnap (1.1.8) msgpack (~> 1.0) buftok (0.2.0) builder (3.2.3) - byebug (9.0.6) + byebug (9.1.0) capistrano (3.4.0) i18n rake (>= 10.0.0) @@ -106,20 +100,21 @@ GEM capistrano (~> 3.1, >= 3.1.0) chronic (0.10.2) cityhash (0.9.0) - coderay (1.1.1) - colorize (0.7.7) + coderay (1.1.2) + concurrent-ruby (1.0.5) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.2) - daemons (1.2.3) + crass (1.0.3) + daemons (1.2.6) dalli (2.7.6) - delayed_job (4.1.2) - activesupport (>= 3.0, < 5.1) - delayed_job_active_record (4.1.1) - activerecord (>= 3.0, < 5.1) + delayed_job (4.1.4) + activesupport (>= 3.0, < 5.2) + delayed_job_active_record (4.1.2) + activerecord (>= 3.0, < 5.2) delayed_job (>= 3.0, < 5) + diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.24) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) dotenv (2.1.2) dotenv-rails (2.1.2) @@ -132,13 +127,14 @@ GEM activesupport (>= 3.0.0) faraday (0.10.1) multipart-post (>= 1.2, < 3) - ffaker (2.5.0) - ffi (1.9.10-x64-mingw32) + ffaker (2.8.1) + ffi (1.9.18) + ffi (1.9.18-x64-mingw32) gctools (0.2.4) get_process_mem (0.2.1) - globalid (0.3.7) - activesupport (>= 4.1.0) - google-api-client (0.9.9) + globalid (0.4.1) + activesupport (>= 4.2.0) + google-api-client (0.9.28) addressable (~> 2.3) googleauth (~> 0.5) httpclient (~> 2.7) @@ -147,7 +143,6 @@ GEM mime-types (>= 1.6) representable (~> 2.3.0) retriable (~> 2.0) - thor (~> 0.19) googleauth (0.5.1) faraday (~> 0.9) jwt (~> 1.4) @@ -157,35 +152,37 @@ GEM os (~> 0.9) signet (~> 0.7) hashdiff (0.3.7) - highline (1.7.8) + highline (1.7.10) hike (1.2.3) http (2.2.2) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.2) + http-form_data (1.0.3) http_parser.rb (0.6.0) - httparty (0.15.5) + httparty (0.15.6) multi_xml (>= 0.5.2) - httpclient (2.8.0) + httpclient (2.8.3) hurley (0.2) - i18n (0.8.1) + i18n (0.9.1) + concurrent-ruby (~> 1.0) jmespath (1.3.1) json (1.8.6) jwt (1.5.6) - kgio (2.10.0) - libv8 (3.16.14.17) + kgio (2.11.1) + libv8 (3.16.14.19) little-plugger (1.1.4) - logging (2.1.0) + logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) mechanize (2.7.5) domain_name (~> 0.5, >= 0.5.1) http-cookie (~> 1.0) @@ -197,19 +194,20 @@ GEM webrobots (>= 0.0.9, < 0.2) memcache-client (1.8.5) memcache_mock (0.0.14) - memoist (0.14.0) + memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) metaclass (0.0.4) - method_source (0.8.2) + method_source (0.9.0) mime-types (2.99.3) + mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.1) - mocha (1.2.1) + minitest (5.11.1) + mocha (1.3.0) metaclass (~> 0.0.1) - msgpack (1.1.0) - msgpack (1.1.0-x64-mingw32) - multi_json (1.12.1) + msgpack (1.2.2) + msgpack (1.2.2-x64-mingw32) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) naught (1.1.0) @@ -219,9 +217,9 @@ GEM net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (2.9.2) - netrc (0.10.3) - newrelic_rpm (4.6.0.338) + net-ssh (4.2.0) + netrc (0.11.0) + newrelic_rpm (4.7.1.340) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) nokogiri (1.8.1-x64-mingw32) @@ -229,8 +227,8 @@ GEM nokogumbo (1.4.13) nokogiri ntlm-http (0.1.1) - oauth2 (1.3.0) - faraday (>= 0.8, < 0.11) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) @@ -238,17 +236,16 @@ GEM os (0.9.6) pg (0.19.0) pg (0.19.0-x64-mingw32) - protected_attributes (1.1.3) + protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) - pry (0.10.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.5.1) + byebug (~> 9.1) pry (~> 0.10) public_suffix (3.0.1) - rack (1.6.5) + rack (1.6.8) rack-test (0.6.3) rack (>= 1.0) radix62 (1.0.1) @@ -265,8 +262,8 @@ GEM 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) @@ -276,16 +273,20 @@ GEM activesupport (= 4.2.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.17.0) - rake (12.0.0) + raindrops (0.19.0) + rake (12.3.0) rakismet (1.5.4) - recaptcha (4.4.1) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + recaptcha (4.6.3) json ref (2.0.0) representable (2.3.0) uber (~> 0.0.7) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -297,38 +298,41 @@ GEM netrc (~> 0.7) retriable (2.1.0) rmagick (2.16.0) - ruby-prof (0.15.8) + ruby-prof (0.17.0) rubyzip (1.2.1) safe_yaml (1.0.4) sanitize (4.5.0) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.4.23) - sass-rails (5.0.6) + 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) shoulda-context (1.2.2) - shoulda-matchers (3.1.1) + shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - signet (0.7.2) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simple_form (3.4.0) - actionpack (> 4, < 5.1) - activemodel (> 4, < 5.1) + simple_form (3.5.0) + actionpack (> 4, < 5.2) + activemodel (> 4, < 5.2) simple_oauth (0.3.1) - simplecov (0.13.0) + simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - slop (3.6.0) + simplecov-html (0.10.2) sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) @@ -338,27 +342,27 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sshkit (1.7.1) - colorize (>= 0.7.0) + sshkit (1.15.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) statistics2 (0.54) - streamio-ffmpeg (1.0.0) + streamio-ffmpeg (3.0.2) + multi_json (~> 1.8) stripe (1.25.0) json (~> 1.8.1) rest-client (~> 1.4) - term-ansicolor (1.3.2) + term-ansicolor (1.6.0) tins (~> 1.0) test_after_commit (1.1.0) activerecord (>= 3.2) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.19.4) + thor (0.20.0) thread_safe (0.3.6) tilt (1.4.1) - timecop (0.8.1) - tins (1.6.0) + timecop (0.9.1) + tins (1.16.3) twitter (6.0.0) addressable (~> 2.5) buftok (~> 0.2.0) @@ -369,29 +373,29 @@ GEM memoizable (~> 0.4.2) naught (~> 1.1) simple_oauth (~> 0.3.1) - tzinfo (1.2.2) + tzinfo (1.2.4) thread_safe (~> 0.1) - tzinfo-data (1.2015.6) + tzinfo-data (1.2017.3) tzinfo (>= 1.0.0) uber (0.0.15) - uglifier (3.0.4) + uglifier (4.1.3) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) - unf_ext (0.0.7.1-x64-mingw32) - unicorn (5.2.0) + unf_ext (0.0.7.4) + unf_ext (0.0.7.4-x64-mingw32) + unicorn (5.4.0) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - webmock (3.1.1) + webmock (3.3.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff webrobots (0.1.2) - whenever (0.9.7) + whenever (0.10.0) chronic (>= 0.6.3) PLATFORMS @@ -415,7 +419,7 @@ DEPENDENCIES dalli delayed_job delayed_job_active_record - diff-lcs! + diff-lcs dotenv-rails dtext_rb! factory_girl @@ -467,4 +471,4 @@ DEPENDENCIES whenever BUNDLED WITH - 1.14.6 + 1.16.0