Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-02 21:10:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-02 21:10:57 +0300
commit63fbe648bba03254f7658b50deb2521fa8ac08d3 (patch)
treebb01ef4333b3bf8d34f42f4fc7f04184a48ab626 /lib/gitlab/graphql
parentf62efc386492a3e7ee2243202389d29ab62b5978 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/graphql')
-rw-r--r--lib/gitlab/graphql/queries.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/graphql/queries.rb b/lib/gitlab/graphql/queries.rb
index 5d3a9245427..cf06a2729d9 100644
--- a/lib/gitlab/graphql/queries.rb
+++ b/lib/gitlab/graphql/queries.rb
@@ -240,6 +240,9 @@ module Gitlab
end
end
+ # TODO: some queries live under app/graphql/queries - we should look there if/when we add fragments there
+ # See: https://gitlab.com/gitlab-org/gitlab/-/issues/361079
+ # for fragments too.
class Fragments
def initialize(root, dir = 'app/assets/javascripts')
@root = root
@@ -278,7 +281,7 @@ module Gitlab
def self.all
['.', 'ee'].flat_map do |prefix|
- find(Rails.root / prefix / 'app/assets/javascripts')
+ find(Rails.root / prefix / 'app/assets/javascripts') + find(Rails.root / prefix / 'app/graphql/queries')
end
end