From d8716cc72d5d4d79f373291a1649199c4ce4d407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Mon, 1 May 2017 12:19:24 +0200 Subject: [PATCH 1/3] updates gem versions --- Gemfile | 6 +++--- Gemfile.lock | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index 0a27ce5bc..c8274a063 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'omniauth-google-oauth2', '~> 0.4.0' gem 'kaminari', '~> 1.0.1' gem 'ancestry', '~> 2.2.2' gem 'acts-as-taggable-on' -gem 'responders', '~> 2.3.0' +gem 'responders', '~> 2.4.0' gem 'foundation-rails', '~> 6.2.4.0' gem 'foundation_rails_helper', '~> 2.0.0' gem 'acts_as_votable' @@ -44,7 +44,7 @@ gem 'cancancan', '~> 1.16.0' gem 'social-share-button', '~> 0.10' gem 'initialjs-rails', '0.2.0.4' gem 'unicorn', '~> 5.3.0' -gem 'paranoia', '~> 2.3.0' +gem 'paranoia', '~> 2.3.1' gem 'rinku', '~> 2.0.2', require: 'rails_rinku' gem 'savon' gem 'dalli' @@ -95,7 +95,7 @@ end group :test do gem 'database_cleaner' gem 'poltergeist', '~> 1.14.0' - gem 'coveralls', '~> 0.8.20', require: false + gem 'coveralls', '~> 0.8.21', require: false gem 'email_spec' end diff --git a/Gemfile.lock b/Gemfile.lock index c5ba5df53..f3c112c0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,7 +110,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - coveralls (0.8.20) + coveralls (0.8.21) json (>= 1.8, < 3) simplecov (~> 0.14.1) term-ansicolor (~> 1.3) @@ -205,7 +205,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.0.4) + json (2.1.0) jwt (1.5.6) kaminari (1.0.1) activesupport (>= 4.1.0) @@ -284,8 +284,8 @@ GEM cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - paranoia (2.3.0) - activerecord (>= 4.0, < 5.1) + paranoia (2.3.1) + activerecord (>= 4.0, < 5.2) parser (2.4.0.0) ast (~> 2.2) pg (0.20.0) @@ -338,8 +338,9 @@ GEM redcarpet (3.4.0) referer-parser (0.3.0) request_store (1.3.2) - 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) rinku (2.0.2) rollbar (2.14.1) multi_json @@ -435,7 +436,7 @@ GEM rack (>= 1.3, < 3) rack-accept (~> 0.4) tilt (>= 1.4, < 3) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -482,7 +483,7 @@ DEPENDENCIES capybara (~> 2.13.0) ckeditor (~> 4.2.2) coffee-rails (~> 4.2.1) - coveralls (~> 0.8.20) + coveralls (~> 0.8.21) daemons dalli database_cleaner @@ -512,14 +513,14 @@ DEPENDENCIES omniauth-google-oauth2 (~> 0.4.0) omniauth-twitter paperclip - paranoia (~> 2.3.0) + paranoia (~> 2.3.1) pg (~> 0.20.0) pg_search poltergeist (~> 1.14.0) quiet_assets rails (= 4.2.8) redcarpet (~> 3.4.0) - responders (~> 2.3.0) + responders (~> 2.4.0) rinku (~> 2.0.2) rollbar (~> 2.14.1) rspec-rails (~> 3.5) From 29e5cff13fbb6e7d0ca3f4546cf4daa7e598cd25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Mon, 1 May 2017 12:20:52 +0200 Subject: [PATCH 2/3] updates capistrano --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- config/deploy.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index c8274a063..6893e62fc 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ group :development, :test do gem 'quiet_assets' gem 'letter_opener_web', '~> 1.3.1' gem 'i18n-tasks', '~> 0.9.13' - gem 'capistrano', '~> 3.8.0', require: false + gem 'capistrano', '~> 3.8.1', require: false gem 'capistrano-bundler', '~> 1.2', require: false gem "capistrano-rails", '~> 1.2.3', require: false gem 'rvm1-capistrano3', require: false diff --git a/Gemfile.lock b/Gemfile.lock index f3c112c0b..81422c575 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,7 +51,7 @@ GEM safely_block (>= 0.1.1) user_agent_parser uuidtools - airbrussh (1.1.2) + airbrussh (1.2.0) sshkit (>= 1.6.1, != 1.7.0) akami (1.3.1) gyoku (>= 0.4.0) @@ -72,7 +72,7 @@ GEM uniform_notifier (~> 1.10.0) byebug (9.0.6) cancancan (1.16.0) - capistrano (3.8.0) + capistrano (3.8.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -413,7 +413,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.12.0) + sshkit (1.13.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) term-ansicolor (1.6.0) @@ -476,7 +476,7 @@ DEPENDENCIES bullet (~> 5.5.1) byebug cancancan (~> 1.16.0) - capistrano (~> 3.8.0) + capistrano (~> 3.8.1) capistrano-bundler (~> 1.2) capistrano-rails (~> 1.2.3) capistrano3-delayed-job (~> 1.7.3) diff --git a/config/deploy.rb b/config/deploy.rb index fa786ee85..82b70efa1 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid only for current version of Capistrano -lock '3.8.0' +lock '3.8.1' def deploysecret(key) @deploy_secrets_yml ||= YAML.load_file('config/deploy-secrets.yml')[fetch(:stage).to_s] From f80019aa1fe9fade5f9697cded3c6e2e648f5634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Mon, 1 May 2017 12:35:57 +0200 Subject: [PATCH 3/3] updates ahoy --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6893e62fc..c9f338fd4 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,7 @@ gem 'whenever', require: false gem 'pg_search' gem 'sitemap_generator', '~> 5.3.1' -gem 'ahoy_matey', '~> 1.5.5' +gem 'ahoy_matey', '~> 1.6.0' gem 'groupdate', '~> 3.2.0' # group temporary data gem 'tolk', '~> 2.0.0' # Web interface for translations diff --git a/Gemfile.lock b/Gemfile.lock index 81422c575..c1dc671a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM acts_as_votable (0.10.0) addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) - ahoy_matey (1.5.5) + ahoy_matey (1.6.0) addressable browser (~> 2.0) geocoder @@ -470,7 +470,7 @@ PLATFORMS DEPENDENCIES acts-as-taggable-on acts_as_votable - ahoy_matey (~> 1.5.5) + ahoy_matey (~> 1.6.0) ancestry (~> 2.2.2) browser bullet (~> 5.5.1)