From af0d1e44a620f08d01304fa3046a438248f69c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= Date: Thu, 17 Aug 2023 16:26:23 +0200 Subject: [PATCH 1/2] Remove roullete customization already in template --- .gitlab-ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57dc6d1cc9..26bffb18d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,16 +71,6 @@ stages: - cleanup - report -# This job MUST be defined before including /ci/danger-review.yml below -# because we MUST override the `script` key in the correct order -danger-review: - # This script only exists so that this yaml file is correctly parsed on dev.gitlab.org - # where /ci/danger-review.yml won't be included. In gitlab.com this will be included - # and the script will be overridden. - script: echo "no-op" - rules: - - if: $CI_SERVER_HOST == "gitlab.com" - include: - local: '/.gitlab/ci/rules.gitlab-ci.yml' - template: Jobs/Dependency-Scanning.latest.gitlab-ci.yml -- GitLab From c848ed723c993c96a413dad4ce8e0ac106465a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= Date: Thu, 17 Aug 2023 16:36:18 +0200 Subject: [PATCH 2/2] Adds gitlab-dangerfiles to Gemfile --- Gemfile | 4 ++++ Gemfile.lock | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/Gemfile b/Gemfile index 483cfd11a3..40dd28ad36 100644 --- a/Gemfile +++ b/Gemfile @@ -23,6 +23,10 @@ group :development, :test do gem 'pry' end +group :development, :test, :danger do + gem 'gitlab-dangerfiles', '~> 3.12.0', require: false +end + group :development do gem 'solargraph' end diff --git a/Gemfile.lock b/Gemfile.lock index 8cbba4574b..c0ee7f9963 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,11 +50,35 @@ GEM capybara (>= 1.0, < 4) launchy childprocess (3.0.0) + claide (1.1.0) + claide-plugins (0.9.2) + cork + nap + open4 (~> 1.3) coderay (1.1.3) + colored2 (3.1.2) concord (0.1.6) adamantium (~> 0.2.0) equalizer (~> 0.0.9) concurrent-ruby (1.1.10) + cork (0.3.0) + colored2 (~> 3.1) + danger (9.2.0) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (~> 3.1) + cork (~> 0.1) + faraday (>= 0.9.0, < 3.0) + faraday-http-cache (~> 2.0) + git (~> 1.7) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) + no_proxy_fix + octokit (~> 5.0) + terminal-table (>= 1, < 4) + danger-gitlab (8.0.0) + danger + gitlab (~> 4.2, >= 4.2.0) debug_inspector (1.1.0) diff-lcs (1.5.0) docker-api (1.34.2) @@ -63,6 +87,21 @@ GEM e2mmap (0.1.0) equalizer (0.0.11) excon (0.62.0) + faraday (2.7.10) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-http-cache (2.5.0) + faraday (>= 0.8) + faraday-net_http (3.0.2) + git (1.11.0) + rchardet (~> 1.8) + gitlab (4.19.0) + httparty (~> 0.20) + terminal-table (>= 1.5.1) + gitlab-dangerfiles (3.12.0) + danger (>= 8.4.5) + danger-gitlab (>= 8.0.0) + rake gitlab-styles (9.0.0) rubocop (~> 1.36.0) rubocop-gitlab-security (~> 0.1.1) @@ -71,6 +110,9 @@ GEM rubocop-rails (~> 2.15) rubocop-rspec (~> 2.12) hash-deep-merge (0.1.1) + httparty (0.21.0) + mini_mime (>= 1.0.0) + multi_xml (>= 0.5.2) i18n (1.12.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) @@ -100,9 +142,16 @@ GEM ice_nine (~> 0.11.1) procto (~> 0.0.2) multi_json (1.13.1) + multi_xml (0.6.0) + nap (1.1.0) + no_proxy_fix (0.1.2) nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) + octokit (5.6.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + open4 (1.3.4) parallel (1.20.1) parser (3.2.2.0) ast (~> 2.4.1) @@ -121,6 +170,7 @@ GEM rack (>= 1.3) rainbow (3.0.0) rake (13.0.1) + rchardet (1.8.0) regexp_parser (1.8.2) reverse_markdown (2.1.1) nokogiri @@ -177,7 +227,11 @@ GEM rubocop-rspec (2.13.1) rubocop (~> 1.33) ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) rubyzip (2.3.0) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -195,6 +249,8 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) thor (1.2.1) thread_safe (0.3.6) tilt (2.0.11) @@ -226,6 +282,7 @@ DEPENDENCIES capybara capybara-screenshot docker-api + gitlab-dangerfiles (~> 3.12.0) gitlab-styles (~> 9.0) hash-deep-merge knapsack -- GitLab