Commit 4515492d authored by Stan Hu's avatar Stan Hu

Upgrade octokit and its dependencies

This is needed to upgrade beyond addressable > 2.6 for the latest
CarrierWave update. In addition, a number of the updates fix Ruby 2.7
deprecation warnings.

octokit changes: https://github.com/octokit/octokit.rb/releases

addressable changes:
https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md

public_suffix:
https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md
parent f358f0d1
......@@ -283,7 +283,7 @@ gem 'rack-proxy', '~> 0.6.0'
gem 'sassc-rails', '~> 2.1.0'
gem 'uglifier', '~> 2.7.2'
gem 'addressable', '~> 2.5.2'
gem 'addressable', '~> 2.7'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
......@@ -419,7 +419,7 @@ group :test do
gem 'guard-rspec'
end
gem 'octokit', '~> 4.9'
gem 'octokit', '~> 4.15'
gem 'mail_room', '~> 0.10.0'
......
......@@ -55,8 +55,8 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
aes_key_wrap (1.0.1)
akismet (3.0.0)
apollo_upload_server (2.0.0.beta.3)
......@@ -650,7 +650,8 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
octokit (4.9.0)
octokit (4.15.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
omniauth (1.9.0)
hashie (>= 3.4.6, < 3.7.0)
......@@ -762,7 +763,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.1.1)
public_suffix (4.0.3)
pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6)
rack (2.0.7)
......@@ -961,9 +962,9 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
scss_lint (0.56.0)
rake (>= 0.9, < 13)
sass (~> 3.5.3)
......@@ -1130,7 +1131,7 @@ DEPENDENCIES
acme-client (~> 2.0.2)
activerecord-explain-analyze (~> 0.1)
acts-as-taggable-on (~> 6.0)
addressable (~> 2.5.2)
addressable (~> 2.7)
akismet (~> 3.0)
apollo_upload_server (~> 2.0.0.beta3)
asana (~> 0.9)
......@@ -1272,7 +1273,7 @@ DEPENDENCIES
net-ssh (~> 5.2)
nokogiri (~> 1.10.5)
oauth2 (~> 1.4)
octokit (~> 4.9)
octokit (~> 4.15)
omniauth (~> 1.8)
omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.3)
......
---
title: Upgrade octokit and its dependencies
merge_request: 22946
author:
type: other
......@@ -5,7 +5,7 @@ class GithubService
def initialize(access_token, repo_path, api_endpoint: nil)
@access_token = access_token
@repo_path = repo_path
@api_endpoint = api_endpoint.presence
@api_endpoint = api_endpoint.presence || ::Octokit::Default.api_endpoint
end
def notify(ref, state, params = {})
......
......@@ -189,7 +189,7 @@ module Gitlab
end
def default_api_endpoint
OmniAuth::Strategies::GitHub.default_options[:client_options][:site]
OmniAuth::Strategies::GitHub.default_options[:client_options][:site] || ::Octokit::Default.api_endpoint
end
def verify_ssl
......
......@@ -80,7 +80,7 @@ module Gitlab
if host.present? && api_version.present?
"#{host}/api/#{api_version}"
else
github_options[:site]
github_options[:site] || ::Octokit::Default.api_endpoint
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment