From b18cb008dc517579681c3e119ad67ddbcfc9a84f Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sun, 29 Nov 2020 19:21:14 +0100 Subject: [PATCH] suite --- Gemfile | 6 +++--- Gemfile.lock | 33 +++++++++++++-------------------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index 582fbc4..fd670bb 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ group :development, :test do gem "capistrano", '2.15.9', group: :development, require: false gem "rvm-capistrano",'1.4.1', group: :development - gem 'net-ssh', '~>2.7.0' + gem 'net-ssh', '~> 5.1.0' gem 'web-console', '~> 2.0' @@ -68,7 +68,7 @@ gem 'gravatar_image_tag' gem 'roo', '~> 2.1.0' gem 'roo-xls' -gem 'curb' +#gem 'curb' gem 'kaminari-bootstrap' @@ -88,7 +88,7 @@ gem "nokogiri" gem 'twitter-text' -gem 'pygments.rb' +#gem 'pygments.rb' gem 'redcarpet' gem 'omniauth-facebook' diff --git a/Gemfile.lock b/Gemfile.lock index d105132..90e1079 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,7 +75,6 @@ GEM countries (~> 1.2.0) sort_alphabetical (~> 1.0) crass (1.0.4) - curb (0.8.8) currencies (0.4.2) debug_inspector (0.0.2) debugger-linecache (1.2.0) @@ -113,7 +112,7 @@ GEM html2haml (>= 1.0.1) railties (>= 4.0.1) hashie (3.5.7) - highline (1.7.8) + highline (2.0.3) html2haml (2.0.0) erubis (~> 2.7.0) haml (~> 4.0.0) @@ -149,21 +148,21 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) mini_mime (1.0.1) - mini_portile (0.6.2) + mini_portile (0.5.3) minitest (5.11.3) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) mysql2 (0.4.10) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (2.7.0) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) - nokogiri (1.6.6.4) - mini_portile (~> 0.6.0) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) + net-sftp (3.0.0) + net-ssh (>= 5.0.0, < 7.0.0) + net-ssh (5.1.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) @@ -186,9 +185,6 @@ GEM paypal-sdk-merchant (1.117.2) paypal-sdk-core (~> 0.3.0) posix-spawn (0.3.11) - pygments.rb (0.6.3) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.0) rack (1.6.10) rack-test (0.6.3) rack (>= 1.0) @@ -303,7 +299,6 @@ GEM wicked_pdf (0.11.0) rails xml-simple (1.1.5) - yajl-ruby (1.2.1) PLATFORMS ruby @@ -317,7 +312,6 @@ DEPENDENCIES carrierwave coffee-rails (~> 4.1.0) country_select - curb fastimage formtastic (= 2.3.0) formtastic-bootstrap @@ -330,13 +324,12 @@ DEPENDENCIES jquery-rails kaminari-bootstrap mysql2 - net-ssh (~> 2.7.0) + net-ssh (~> 5.1.0) nokogiri ogone-rails omniauth-facebook paypal-sdk-merchant posix-spawn - pygments.rb rails (= 4.2.10) rails_autolink redcarpet @@ -359,4 +352,4 @@ DEPENDENCIES wicked_pdf BUNDLED WITH - 1.16.1 + 1.17.3