From d91e45e93d3f3243f20f08484dbec2b2ab34428f Mon Sep 17 00:00:00 2001 From: Giovanni Cappellotto Date: Sat, 15 Feb 2020 23:40:31 -0500 Subject: [PATCH] Update omniauth-github Fix authentication using query params deprecation. See https://github.com/omniauth/omniauth-github/pull/84 --- .ruby-version | 2 +- Gemfile | 6 ++++-- Gemfile.lock | 42 +++++++++++++++++----------------------- chrome_app/manifest.json | 2 +- config/application.rb | 2 +- 5 files changed, 25 insertions(+), 29 deletions(-) diff --git a/.ruby-version b/.ruby-version index 8e8299dc..79a61441 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.2 +2.4.4 diff --git a/Gemfile b/Gemfile index ed4fa47c..fa60a41e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'http://rubygems.org' -ruby '2.4.2' +ruby '2.4.4' gem 'rails', '~> 5.1' @@ -27,8 +27,10 @@ gem 'mongoid' # Omniauth gem 'omniauth' -gem 'omniauth-github' gem 'omniauth-twitter' +# Fix authentication using query params deprecation +# See https://github.com/omniauth/omniauth-github/pull/84 +gem 'omniauth-github', '>= 1.4' # Puma gem 'puma' diff --git a/Gemfile.lock b/Gemfile.lock index 8c7b7f83..3b059321 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,7 +87,7 @@ GEM activesupport (>= 4.0, < 6) excon (0.59.0) execjs (2.7.0) - faraday (0.12.2) + faraday (0.17.3) multipart-post (>= 1.2, < 3) ffi (1.9.18) fog-aws (2.0.0) @@ -108,7 +108,7 @@ GEM formatador (0.2.5) globalid (0.4.1) activesupport (>= 4.2.0) - hashie (3.5.6) + hashie (3.6.0) high_voltage (3.0.0) http (3.0.0) addressable (~> 2.3) @@ -128,7 +128,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.1.0) - jwt (1.5.6) + jwt (2.2.1) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -144,7 +144,6 @@ GEM kaminari-mongoid (1.0.1) kaminari-core (~> 1.0) mongoid - libv8 (3.16.14.19) loofah (2.1.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -173,35 +172,35 @@ GEM mongoid (6.2.1) activemodel (~> 5.1) mongo (>= 2.4.1, < 3.0.0) - multi_json (1.12.2) + multi_json (1.14.1) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.1) naught (1.1.0) newrelic_rpm (4.6.0.338) nio4r (2.1.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) oauth (0.5.3) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.7.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) - omniauth-github (1.3.0) + omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) - omniauth (~> 1.2) + omniauth-oauth2 (1.6.0) + oauth2 (~> 1.1) + omniauth (~> 1.9) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack @@ -215,7 +214,7 @@ GEM method_source (~> 0.9.0) public_suffix (3.0.1) puma (3.11.0) - rack (2.0.7) + rack (2.2.2) rack-test (0.8.2) rack (>= 1.0, < 3) rails (5.1.4) @@ -253,7 +252,6 @@ GEM rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rdiscount (2.2.0.1) - ref (2.0.0) rubocop (0.51.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -295,9 +293,6 @@ GEM tins (~> 1.0) test-unit (3.2.6) power_assert - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) - ref thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) @@ -352,7 +347,7 @@ DEPENDENCIES newrelic_rpm octokit omniauth - omniauth-github + omniauth-github (>= 1.4) omniauth-twitter pry puma @@ -364,12 +359,11 @@ DEPENDENCIES simplecov sucker_punch (~> 2.0) test-unit (~> 3.0) - therubyracer twitter uglifier (>= 1.0.3) RUBY VERSION - ruby 2.4.2p198 + ruby 2.4.4p296 BUNDLED WITH - 1.16.0 + 1.16.6 diff --git a/chrome_app/manifest.json b/chrome_app/manifest.json index 5d8592c9..57cb530b 100644 --- a/chrome_app/manifest.json +++ b/chrome_app/manifest.json @@ -1 +1 @@ -{"name":"Tomatoes","app":{"urls":["http://tomato.es/"],"launch":{"web_url":"http://tomato.es/"}},"icons":{"128":"icon_128.png"},"version":"0.14.9","description":"Pomodoro Technique\u00ae web-based time tracker"} +{"name":"Tomatoes","app":{"urls":["http://tomato.es/"],"launch":{"web_url":"http://tomato.es/"}},"icons":{"128":"icon_128.png"},"version":"0.14.10","description":"Pomodoro Technique\u00ae web-based time tracker"} diff --git a/config/application.rb b/config/application.rb index 8e920a01..afb19960 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,7 +12,7 @@ Bundler.require(*Rails.groups) module TomatoesApp - VERSION = '0.14.9'.freeze + VERSION = '0.14.10'.freeze REPO = 'https://github.com/tomatoes-app/tomatoes'.freeze class Application < Rails::Application