From 707d597aab086e969ca5062d75f30f7fb9dc7b60 Mon Sep 17 00:00:00 2001 From: Markus Koller Date: Wed, 9 Sep 2020 19:59:15 +0200 Subject: WIP: Use temporary branches for some gems --- ruby/Gemfile | 8 +++---- ruby/Gemfile.lock | 66 ++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/ruby/Gemfile b/ruby/Gemfile index cdb388b5d..9c6d348c5 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -3,13 +3,13 @@ source 'https://rubygems.org' # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 gem 'bundler', '>= 1.17.3' -gem 'rugged', '~> 0.28' +gem 'rugged', '~> 1.0.0' gem 'github-linguist', '~> 7.9', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.1' gem 'rdoc', '~> 6.0' -gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false +gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false, git: 'https://gitlab.com/gitlab-org/gollum-lib.git', branch: 'upgrade-rugged-dependencies' +gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.3.gitlab.1', require: false gem 'grpc', '~> 1.30.2' gem 'sentry-raven', '~> 3.0', require: false gem 'faraday', '~> 1.0' @@ -20,7 +20,7 @@ gem 'gitlab-labkit', '~> 0.12.0' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE -gem 'licensee', '~> 8.9.0' +gem 'licensee', '~> 9.14.0', git: 'https://github.com/licensee/licensee.git', branch: 'master' gem 'google-protobuf', '~> 3.12' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 19dc85ff4..52fffcce8 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -1,3 +1,29 @@ +GIT + remote: https://github.com/licensee/licensee.git + revision: 3a028b6cb9c2c5d8cd1905faed735fdc23bc133e + branch: master + specs: + licensee (9.14.0) + dotenv (~> 2.0) + octokit (~> 4.17) + reverse_markdown (~> 1.0) + rugged (>= 0.24, < 2.0) + thor (>= 0.19, < 2.0) + +GIT + remote: https://gitlab.com/gitlab-org/gollum-lib.git + revision: 44e396f18669e0513ba9eb7d26d7097a93860e2b + branch: upgrade-rugged-dependencies + specs: + gitlab-gollum-lib (4.2.7.10.gitlab.1) + gemojione (~> 3.2) + github-markup (~> 1.6) + gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1) + nokogiri (>= 1.6.1, < 2.0) + rouge (~> 3.1) + sanitize (~> 4.6.4) + stringex (~> 2.6) + GEM remote: https://rubygems.org/ specs: @@ -40,6 +66,7 @@ GEM crass (1.0.6) diff-lcs (1.3) docile (1.3.2) + dotenv (2.7.6) equalizer (0.0.11) erubi (1.9.0) escape_utils (1.2.1) @@ -56,17 +83,9 @@ GEM mini_mime (~> 1.0) rugged (>= 0.25.1) github-markup (1.7.0) - gitlab-gollum-lib (4.2.7.9) - gemojione (~> 3.2) - github-markup (~> 1.6) - gitlab-gollum-rugged_adapter (~> 0.4.4.2) - nokogiri (>= 1.6.1, < 2.0) - rouge (~> 3.1) - sanitize (~> 4.6.4) - stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.2) + gitlab-gollum-rugged_adapter (0.4.4.3.gitlab.1) mime-types (>= 1.15) - rugged (~> 0.25) + rugged (~> 1.0) gitlab-labkit (0.12.0) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) @@ -90,9 +109,7 @@ GEM opentracing (~> 0.3) thrift jaro_winkler (1.5.2) - json (2.2.0) - licensee (8.9.2) - rugged (~> 0.24) + json (2.3.1) listen (0.5.3) loofah (2.5.0) crass (~> 1.0.2) @@ -108,10 +125,13 @@ GEM minitest (5.14.0) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri + octokit (4.18.0) + faraday (>= 0.9) + sawyer (~> 0.8.0, >= 0.5.3) opentracing (0.5.0) optimist (3.0.1) parallel (1.17.0) @@ -141,7 +161,9 @@ GEM optimist (>= 3.0.0) rdoc (6.2.0) redis (4.1.3) - rouge (3.20.0) + reverse_markdown (1.4.0) + nokogiri + rouge (3.23.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -169,12 +191,15 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.0) - rugged (0.28.4.1) + rugged (1.0.1) safe_yaml (1.0.5) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) sentry-raven (3.0.4) faraday (>= 1.0) simplecov (0.17.1) @@ -183,6 +208,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.2) stringex (2.8.5) + thor (1.0.1) thread_safe (0.3.6) thrift (0.11.0.0) timecop (0.9.1) @@ -213,14 +239,14 @@ DEPENDENCIES factory_bot faraday (~> 1.0) github-linguist (~> 7.9) - gitlab-gollum-lib (~> 4.2.7.9) - gitlab-gollum-rugged_adapter (~> 0.4.4.2) + gitlab-gollum-lib (~> 4.2.7.9)! + gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1) gitlab-labkit (~> 0.12.0) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.12) grpc (~> 1.30.2) grpc-tools (= 1.30.2) - licensee (~> 8.9.0) + licensee (~> 9.14.0)! listen (~> 0.5.0) pry (~> 0.12.2) rbtrace @@ -228,7 +254,7 @@ DEPENDENCIES rspec rspec-parameterized rubocop (~> 0.69) - rugged (~> 0.28) + rugged (~> 1.0.0) sentry-raven (~> 3.0) simplecov (~> 0.17.1) timecop -- cgit v1.2.3