summaryrefslogtreecommitdiff
path: root/tooling
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-07-20 15:40:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-07-20 15:40:28 +0000
commitb595cb0c1dec83de5bdee18284abe86614bed33b (patch)
tree8c3d4540f193c5ff98019352f554e921b3a41a72 /tooling
parent2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff)
downloadgitlab-ce-b595cb0c1dec83de5bdee18284abe86614bed33b.tar.gz
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'tooling')
-rwxr-xr-xtooling/bin/qa/check_if_qa_only_spec_changes22
-rw-r--r--tooling/config/CODEOWNERS.yml4
-rw-r--r--tooling/danger/project_helper.rb4
-rw-r--r--tooling/graphql/docs/renderer.rb2
4 files changed, 6 insertions, 26 deletions
diff --git a/tooling/bin/qa/check_if_qa_only_spec_changes b/tooling/bin/qa/check_if_qa_only_spec_changes
deleted file mode 100755
index 5b9166b41fe..00000000000
--- a/tooling/bin/qa/check_if_qa_only_spec_changes
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# This script assumes the first argument is a path to a file containing a list of changed files and the second argument
-# is the path of a file where a list of end-to-end spec files with the leading 'qa/' trimmed will be written to if
-# all the files are end-to-end test spec files.
-
-abort("ERROR: Please specify the file containing the list of changed files and a file where the qa only spec files will be written") if ARGV.size != 2
-
-changed_files_path = ARGV.shift
-output_file = ARGV.shift
-
-return unless File.exist?(changed_files_path)
-
-changed_files = File.read(changed_files_path).split(' ')
-
-all_files_are_qa_specs = changed_files.all? { |file_path| file_path =~ %r{^qa\/qa\/specs\/features\/} }
-
-if all_files_are_qa_specs
- qa_spec_paths_trimmed = changed_files.map { |path| path.sub('qa/', '') }
- File.write(output_file, qa_spec_paths_trimmed.join(' '))
-end
diff --git a/tooling/config/CODEOWNERS.yml b/tooling/config/CODEOWNERS.yml
index 4fa7338b32d..a8ae90437e2 100644
--- a/tooling/config/CODEOWNERS.yml
+++ b/tooling/config/CODEOWNERS.yml
@@ -15,8 +15,8 @@
- '/{,ee/}lib/**/*%{keyword}*{,/**/*}'
deny:
keywords:
- - '*author.*'
- - '*author_*'
+ - '*author{,s}.*'
+ - '*author{,s}_*'
- '*authored*'
- '*authoring*'
- '*.png'
diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb
index dbe3e6edd98..b37b86ceecc 100644
--- a/tooling/danger/project_helper.rb
+++ b/tooling/danger/project_helper.rb
@@ -26,7 +26,7 @@ module Tooling
%r{\Adoc/.*(\.(md|png|gif|jpg|yml))\z} => :docs,
%r{\A(CONTRIBUTING|LICENSE|MAINTENANCE|PHILOSOPHY|PROCESS|README)(\.md)?\z} => :docs,
%r{\Adata/whats_new/} => :docs,
- %r{\Adb/docs/.yml\z} => :docs,
+ %r{\Adb/docs/.+\.yml\z} => :docs,
%r{\Adata/deprecations/} => :none,
%r{\Adata/removals/} => :none,
@@ -57,6 +57,7 @@ module Tooling
spec/frontend/tracking/.*\.js |
spec/frontend/tracking_spec\.js
)\z}x => [:frontend, :product_intelligence],
+ [%r{\.(vue|js)\z}, %r{trackRedis}] => [:frontend, :product_intelligence],
%r{\A((ee|jh)/)?app/assets/} => :frontend,
%r{\A((ee|jh)/)?app/views/.*\.svg} => :frontend,
%r{\A((ee|jh)/)?app/views/} => [:frontend, :backend],
@@ -111,6 +112,7 @@ module Tooling
%r{\Atooling/} => :tooling,
%r{(CODEOWNERS)} => :tooling,
%r{(tests.yml)} => :tooling,
+ %r{\A\.gitpod\.yml} => :tooling,
%r{\Alib/gitlab/ci/templates} => :ci_template,
diff --git a/tooling/graphql/docs/renderer.rb b/tooling/graphql/docs/renderer.rb
index 0c2e8cb3b86..811d5f0f770 100644
--- a/tooling/graphql/docs/renderer.rb
+++ b/tooling/graphql/docs/renderer.rb
@@ -22,7 +22,7 @@ module Tooling
@output_dir = output_dir
@template = template
@layout = Haml::Engine.new(File.read(template))
- @parsed_schema = GraphQLDocs::Parser.new(schema.graphql_definition, {}).parse
+ @parsed_schema = GraphQLDocs::Parser.new(schema, {}).parse
@schema = schema
@seen = Set.new
end