Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
79f94840
Commit
79f94840
authored
Apr 10, 2020
by
Rajendra Kadam
Committed by
Peter Leitzen
Apr 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move prepend to last line in app finder
parent
895cb36f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
app/finders/license_template_finder.rb
app/finders/license_template_finder.rb
+2
-2
app/finders/projects_finder.rb
app/finders/projects_finder.rb
+2
-2
app/finders/template_finder.rb
app/finders/template_finder.rb
+2
-2
changelogs/unreleased/app-finders-prepend.yml
changelogs/unreleased/app-finders-prepend.yml
+5
-0
No files found.
app/finders/license_template_finder.rb
View file @
79f94840
...
...
@@ -13,8 +13,6 @@
class
LicenseTemplateFinder
include
Gitlab
::
Utils
::
StrongMemoize
prepend_if_ee
(
'::EE::LicenseTemplateFinder'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader
:project
,
:params
def
initialize
(
project
,
params
=
{})
...
...
@@ -52,3 +50,5 @@ class LicenseTemplateFinder
params
.
fetch
(
:popular
,
nil
)
end
end
LicenseTemplateFinder
.
prepend_if_ee
(
'::EE::LicenseTemplateFinder'
)
app/finders/projects_finder.rb
View file @
79f94840
...
...
@@ -27,8 +27,6 @@
class
ProjectsFinder
<
UnionFinder
include
CustomAttributesFilter
prepend_if_ee
(
'::EE::ProjectsFinder'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
attr_accessor
:params
attr_reader
:current_user
,
:project_ids_relation
...
...
@@ -225,3 +223,5 @@ class ProjectsFinder < UnionFinder
{
min_access_level:
params
[
:min_access_level
]
}
end
end
ProjectsFinder
.
prepend_if_ee
(
'::EE::ProjectsFinder'
)
app/finders/template_finder.rb
View file @
79f94840
...
...
@@ -3,8 +3,6 @@
class
TemplateFinder
include
Gitlab
::
Utils
::
StrongMemoize
prepend_if_ee
(
'::EE::TemplateFinder'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
VENDORED_TEMPLATES
=
HashWithIndifferentAccess
.
new
(
dockerfiles:
::
Gitlab
::
Template
::
DockerfileTemplate
,
gitignores:
::
Gitlab
::
Template
::
GitignoreTemplate
,
...
...
@@ -42,3 +40,5 @@ class TemplateFinder
end
end
end
TemplateFinder
.
prepend_if_ee
(
'::EE::TemplateFinder'
)
changelogs/unreleased/app-finders-prepend.yml
0 → 100644
View file @
79f94840
---
title
:
Move prepend to last line in finders files
merge_request
:
29274
author
:
Rajendra Kadam
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment