diff --git a/Gemfile b/Gemfile index 6636d5b..5e8c8bc 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'uglifier', '>= 1.3.0' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby -gem 'carrierwave', '~> 0.9' +gem 'carrierwave', '~> 1.3' gem 'bootstrap-sass', '~> 2.3.2' # Use CoffeeScript for .coffee assets and views diff --git a/Gemfile.lock b/Gemfile.lock index 2556ae5..e083e75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,8 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + airbrussh (1.4.0) + sshkit (>= 1.6.1, != 1.7.0) arel (8.0.0) bcrypt (3.1.12) bindex (0.5.0) @@ -48,6 +50,21 @@ GEM brakeman (4.3.1) builder (3.2.3) byebug (10.0.2) + capistrano (3.15.0) + airbrussh (>= 1.0.0) + i18n + rake (>= 10.0.0) + sshkit (>= 1.9.0) + capistrano-bundler (2.0.1) + capistrano (~> 3.1) + capistrano-passenger (0.2.0) + capistrano (~> 3.0) + capistrano-rails (1.6.1) + capistrano (~> 3.1) + capistrano-bundler (>= 1.1, < 3) + capistrano-rbenv (2.2.0) + capistrano (~> 3.1) + sshkit (~> 1.3) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -55,12 +72,11 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) - carrierwave (0.11.2) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + carrierwave (1.3.2) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) - mimemagic (>= 0.3.0) + ssrf_filter (~> 1.0) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) coffee-rails (4.2.2) @@ -70,7 +86,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.8) crass (1.0.4) erubi (1.7.1) erubis (2.7.0) @@ -98,12 +114,12 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - i18n (1.2.0) + i18n (1.8.8) concurrent-ruby (~> 1.0) jbuilder (2.8.0) activesupport (>= 4.2.0) multi_json (>= 1.2) - json (2.1.0) + json (2.5.1) jwt (1.5.6) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -115,16 +131,19 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) method_source (0.9.2) - mime-types (3.2.2) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mimemagic (0.3.2) + mime-types-data (3.2020.1104) mini_mime (1.0.1) mini_portile2 (2.3.0) - minitest (5.11.3) + minitest (5.14.3) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) + mysql2 (0.5.3) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) + net-ssh (6.1.0) nio4r (2.3.1) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) @@ -146,9 +165,7 @@ GEM omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) - pg (1.1.3) public_suffix (3.0.3) - puma (3.12.0) rack (2.0.6) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -212,6 +229,10 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + sshkit (1.21.2) + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) + ssrf_filter (1.0.7) temple (0.8.0) thor (0.20.3) thread_safe (0.3.6) @@ -219,7 +240,7 @@ GEM turbolinks (5.2.0) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) @@ -242,17 +263,20 @@ DEPENDENCIES bootstrap-sass (~> 2.3.2) brakeman byebug + capistrano (~> 3.7, >= 3.7.1) + capistrano-passenger (~> 0.2.0) + capistrano-rails (~> 1.2) + capistrano-rbenv capybara (~> 2.13) - carrierwave (~> 0.9) + carrierwave (~> 1.3) coffee-rails (~> 4.2) figaro haml-rails hpricot jbuilder (~> 2.5) listen (>= 3.0.5, < 3.2) + mysql2 omniauth-google-oauth2 (~> 0.2.1) - pg - puma (~> 3.7) rails (~> 5.1.6) recaptcha sass-rails (~> 5.0)