diff --git a/Gemfile b/Gemfile index 45c2c3af97f..596162b237c 100644 --- a/Gemfile +++ b/Gemfile @@ -2,38 +2,38 @@ source 'https://rubygems.org' ruby '2.4.1' -gem 'rails', '~> 5.1.0' +gem 'rails', '~> 5.2.8', '>= 5.2.8.1' gem 'rails-i18n' gem 'uglifier' -gem 'jquery-rails' -gem 'devise' +gem 'jquery-rails', '>= 4.4.0' +gem 'devise', '>= 4.7.1' gem 'devise-i18n', git: 'https://github.com/tigrish/devise-i18n.git', ref: '2665bce94816fb3d0883e040526921f39e3f5341' gem 'therubyracer' gem 'mysql2' -gem 'diffy' -gem 'sanitize' +gem 'diffy', '>= 3.4.1' +gem 'sanitize', '>= 5.2.1' gem 'newrelic_rpm' gem 'will_paginate' gem 'will-paginate-i18n' gem 'sass-rails' # Just for the compressor gem 'strip_attributes' -gem 'redcarpet' +gem 'redcarpet', '>= 3.5.1' gem 'ignorable' gem 'coderay', git: 'https://github.com/JasonBarnabe/coderay.git', branch: 'js-ident-unicode' gem 'thinking-sphinx' gem 'ts-delayed-delta', git: 'https://github.com/pat/ts-delayed-delta', ref: '0aef2195f3acc1da048f18bc0191c90538565705' -gem 'delayed_job' -gem 'delayed_job_active_record' +gem 'delayed_job', '>= 4.1.5' +gem 'delayed_job_active_record', '>= 4.1.3' gem 'daemons' gem 'public_suffix' gem 'transifex-ruby', git: 'https://github.com/tmaesaka/transifex-ruby.git' gem 'dalli' -gem 'omniauth', '>= 1.6.0' -gem 'omniauth-github' -gem 'omniauth-google-oauth2', '>= 0.4.1' +gem 'omniauth', '>= 2.0.0' +gem 'omniauth-github', '>= 2.0.0' +gem 'omniauth-google-oauth2', '>= 0.5.0' gem 'detect_language' gem 'levenshtein' -gem "paperclip" +gem "paperclip", ">= 5.2.1" gem 'fancybox2-rails' gem 'it' gem 'rb-readline' @@ -45,12 +45,12 @@ gem 'byebug', group: [:development, :test] group :development do gem 'bullet' - gem 'capistrano', "~> 3.7" - gem 'capistrano-rails', "~> 1.2" + gem 'capistrano', '~> 3.8', '>= 3.8.2' + gem 'capistrano-rails', '~> 1.3', '>= 1.3.0' gem 'capistrano-passenger' - gem 'capistrano-bundler', '~> 1.2' + gem 'capistrano-bundler', '~> 1.2', '>= 1.2.0' gem 'capistrano-rvm' - gem 'capistrano3-delayed-job', '~> 1.0' + gem 'capistrano3-delayed-job', '~> 1.7', '>= 1.7.3' end group :profile do diff --git a/Gemfile.lock b/Gemfile.lock index d1df57c208e..28df16ed9bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,276 +25,311 @@ GIT GIT remote: https://github.com/tmaesaka/transifex-ruby.git - revision: a66843ca262e5b403813154512b563efda03f137 + revision: b91f496ca490cd4e90847fb12249e7d047e875d9 specs: - transifex-ruby (0.0.5) - faraday (>= 0.8.0) - faraday_middleware (~> 0.9.0) + transifex-ruby (0.1.0) + faraday (>= 1, < 2) + faraday_middleware (>= 0.9.0) hashie (>= 1.2.0) GEM remote: https://rubygems.org/ specs: ace-rails-ap (4.1.2) - actioncable (5.1.2) - actionpack (= 5.1.2) + actioncable (5.2.8.1) + actionpack (= 5.2.8.1) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.2) - actionpack (= 5.1.2) - actionview (= 5.1.2) - activejob (= 5.1.2) + websocket-driver (>= 0.6.1) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.2) - actionview (= 5.1.2) - activesupport (= 5.1.2) - rack (~> 2.0) - rack-test (~> 0.6.3) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.2) - activesupport (= 5.1.2) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.2) - activesupport (= 5.1.2) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (5.1.2) - activesupport (= 5.1.2) - activerecord (5.1.2) - activemodel (= 5.1.2) - activesupport (= 5.1.2) - arel (~> 8.0) - activesupport (5.1.2) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) + arel (>= 9.0) + activestorage (5.2.8.1) + actionpack (= 5.2.8.1) + activerecord (= 5.2.8.1) + marcel (~> 1.0.0) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - airbrussh (1.3.0) + airbrussh (1.4.1) sshkit (>= 1.6.1, != 1.7.0) - arel (8.0.0) - bcrypt (3.1.11) - builder (3.2.3) - bullet (5.6.0) + arel (9.0.0) + bcrypt (3.1.18) + builder (3.2.4) + bullet (7.0.3) activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) + uniform_notifier (~> 1.11) byebug (9.0.6) - capistrano (3.8.2) + capistrano (3.17.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.2.0) + capistrano-bundler (1.6.0) capistrano (~> 3.1) - sshkit (~> 1.2) - capistrano-passenger (0.2.0) + capistrano-passenger (0.2.1) capistrano (~> 3.0) - capistrano-rails (1.3.0) + capistrano-rails (1.6.2) capistrano (~> 3.1) - capistrano-bundler (~> 1.1) + capistrano-bundler (>= 1.1, < 3) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano3-delayed-job (1.7.3) + capistrano3-delayed-job (1.7.6) capistrano (~> 3.0, >= 3.0.0) - daemons (~> 1.2.4) + daemons (~> 1.3) climate_control (0.2.0) - cocaine (0.5.8) - climate_control (>= 0.0.3, < 1.0) - concurrent-ruby (1.0.5) - crass (1.0.2) - daemons (1.2.4) + concurrent-ruby (1.1.10) + crass (1.0.6) + daemons (1.4.1) dalli (2.7.6) - delayed_job (4.1.3) - activesupport (>= 3.0, < 5.2) - delayed_job_active_record (4.1.2) - activerecord (>= 3.0, < 5.2) + delayed_job (4.1.11) + activesupport (>= 3.0, < 8.0) + delayed_job_active_record (4.1.7) + activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) detect_language (1.0.7) - devise (4.3.0) + devise (4.8.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.2) + railties (>= 4.1.0) responders warden (~> 1.2.3) - diffy (3.2.0) - erubi (1.6.1) + diffy (3.4.2) + erubi (1.11.0) execjs (2.7.0) fancybox2-rails (0.2.7) railties (>= 3.1.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.9.2) - faraday (>= 0.7.4, < 0.10) - ffi (1.9.18) - globalid (0.4.0) + faraday (1.10.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + ffi (1.15.5) + globalid (0.4.2) activesupport (>= 4.2.0) - hashie (3.5.6) - i18n (0.8.6) - ignorable (0.3.0) + hashie (5.0.0) + i18n (1.12.0) + concurrent-ruby (~> 1.0) + ignorable (0.4.0) activerecord (>= 3) innertube (1.1.0) it (1.0.0) actionpack (>= 3.0.0) - joiner (0.3.4) - activerecord (>= 4.1.0) - jquery-rails (4.3.1) + joiner (0.4.2) + activerecord (>= 5.2.beta1) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.1.0) - jwt (1.5.6) + json (2.6.2) + jwt (2.3.0) levenshtein (0.2.2) libv8 (3.16.14.19) - loofah (2.0.3) + loofah (2.19.0) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (1.0.2) + method_source (1.0.0) middleware (0.1.0) - mime-types (3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) - mini_portile2 (2.2.0) - minitest (5.10.2) - multi_json (1.12.1) + mime-types-data (3.2022.0105) + mimemagic (0.3.10) + nokogiri (~> 1) + rake + mini_mime (1.1.2) + mini_portile2 (2.4.0) + minitest (5.15.0) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.2.3) mysql2 (0.4.8) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.1.0) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) + net-ssh (6.1.0) newrelic_rpm (4.2.0.334) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - nokogumbo (1.4.13) - nokogiri - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) - multi_json (~> 1.3) + nio4r (2.5.8) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.5) + nokogiri (~> 1.8, >= 1.8.4) + oauth2 (2.0.9) + faraday (>= 0.17.3, < 3.0) + jwt (>= 1.0, < 3.0) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (1.6.1) - hashie (>= 3.4.6, < 3.6.0) - rack (>= 1.6.2, < 3) - omniauth-github (1.3.0) - omniauth (~> 1.5) - omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.5.0) - jwt (~> 1.5) - multi_json (~> 1.3) - omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) - omniauth (~> 1.2) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + omniauth (2.1.0) + hashie (>= 3.4.6) + rack (>= 2.2.3) + rack-protection + omniauth-github (2.0.1) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8) + omniauth-google-oauth2 (1.1.1) + jwt (>= 2.0) + oauth2 (~> 2.0.6) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8.0) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) + omniauth (~> 2.0) orm_adapter (0.5.0) - paperclip (5.1.0) + paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) - cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) public_suffix (2.0.5) - rack (2.0.3) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.1.2) - actioncable (= 5.1.2) - actionmailer (= 5.1.2) - actionpack (= 5.1.2) - actionview (= 5.1.2) - activejob (= 5.1.2) - activemodel (= 5.1.2) - activerecord (= 5.1.2) - activesupport (= 5.1.2) - bundler (>= 1.3.0, < 2.0) - railties (= 5.1.2) + rack (2.2.4) + rack-protection (2.2.2) + rack + rack-test (2.0.2) + rack (>= 1.3) + rails (5.2.8.1) + actioncable (= 5.2.8.1) + actionmailer (= 5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) + activemodel (= 5.2.8.1) + activerecord (= 5.2.8.1) + activestorage (= 5.2.8.1) + activesupport (= 5.2.8.1) + bundler (>= 1.3.0) + railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - rails-i18n (5.0.4) - i18n (~> 0.7) - railties (~> 5.0) - railties (5.1.2) - actionpack (= 5.1.2) - activesupport (= 5.1.2) + rails-html-sanitizer (1.4.3) + loofah (~> 2.3) + rails-i18n (5.1.3) + i18n (>= 0.7, < 2) + railties (>= 5.0, < 6) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (12.0.0) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + thor (>= 0.19.0, < 2.0) + rake (13.0.6) rb-readline (0.5.4) - recaptcha (4.3.1) + recaptcha (5.9.0) json - redcarpet (3.4.0) + redcarpet (3.5.1) ref (2.0.0) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) - riddle (2.2.0) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + riddle (2.4.3) ruby-prof (0.16.2) - sanitize (4.5.0) + ruby2_keywords (0.0.5) + sanitize (5.2.3) crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4.1) - sass (3.5.1) - 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.6) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sprockets (3.7.1) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.14.0) + sshkit (1.21.3) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - strip_attributes (1.8.0) - activemodel (>= 3.0, < 6.0) + strip_attributes (1.13.0) + activemodel (>= 3.0, < 8.0) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thinking-sphinx (3.3.0) - activerecord (>= 3.1.0) + thinking-sphinx (5.4.0) + activerecord (>= 4.2.0) builder (>= 2.1.2) innertube (>= 1.0.2) - joiner (>= 0.2.0) + joiner (>= 0.3.4) middleware (>= 0.1.0) - riddle (>= 2.0.0) - thor (0.19.4) + riddle (~> 2.3) + thor (1.2.1) thread_safe (0.3.6) - tilt (2.0.7) - tzinfo (1.2.3) + tilt (2.0.11) + tzinfo (1.2.10) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - uniform_notifier (1.10.0) - warden (1.2.7) - rack (>= 1.0) - websocket-driver (0.6.5) + uniform_notifier (1.16.0) + version_gem (1.1.1) + warden (1.2.9) + rack (>= 2.0.9) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.5) will-paginate-i18n (0.1.15) will_paginate (3.1.6) @@ -305,41 +340,41 @@ DEPENDENCIES ace-rails-ap bullet byebug - capistrano (~> 3.7) - capistrano-bundler (~> 1.2) + capistrano (~> 3.8, >= 3.8.2) + capistrano-bundler (~> 1.2, >= 1.2.0) capistrano-passenger - capistrano-rails (~> 1.2) + capistrano-rails (~> 1.3, >= 1.3.0) capistrano-rvm - capistrano3-delayed-job (~> 1.0) + capistrano3-delayed-job (~> 1.7, >= 1.7.3) coderay! daemons dalli - delayed_job - delayed_job_active_record + delayed_job (>= 4.1.5) + delayed_job_active_record (>= 4.1.3) detect_language - devise + devise (>= 4.7.1) devise-i18n! - diffy + diffy (>= 3.4.1) fancybox2-rails hashie ignorable it - jquery-rails + jquery-rails (>= 4.4.0) levenshtein mysql2 newrelic_rpm - omniauth (>= 1.6.0) - omniauth-github - omniauth-google-oauth2 (>= 0.4.1) - paperclip + omniauth (>= 2.0.0) + omniauth-github (>= 2.0.0) + omniauth-google-oauth2 (>= 0.5.0) + paperclip (>= 5.2.1) public_suffix - rails (~> 5.1.0) + rails (~> 5.2.8, >= 5.2.8.1) rails-i18n rb-readline recaptcha - redcarpet + redcarpet (>= 3.5.1) ruby-prof - sanitize + sanitize (>= 5.2.1) sass-rails strip_attributes therubyracer @@ -354,4 +389,4 @@ RUBY VERSION ruby 2.4.1p111 BUNDLED WITH - 1.15.3 + 1.17.3