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
6ef24415
Commit
6ef24415
authored
May 17, 2020
by
Rajendra Kadam
Committed by
Peter Leitzen
May 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move include to last line for EE
parent
5c94a189
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
4 deletions
+12
-4
changelogs/unreleased/ee-app-1.yml
changelogs/unreleased/ee-app-1.yml
+5
-0
ee/app/models/ee/project.rb
ee/app/models/ee/project.rb
+3
-2
ee/app/presenters/ee/merge_request_presenter.rb
ee/app/presenters/ee/merge_request_presenter.rb
+2
-1
ee/app/serializers/vulnerabilities/finding_entity.rb
ee/app/serializers/vulnerabilities/finding_entity.rb
+2
-1
No files found.
changelogs/unreleased/ee-app-1.yml
0 → 100644
View file @
6ef24415
---
title
:
Move include_if_ee to last line in ee/app
1
merge_request
:
31832
author
:
Rajendra Kadam
type
:
fixed
ee/app/models/ee/project.rb
View file @
6ef24415
...
@@ -10,14 +10,12 @@ module EE
...
@@ -10,14 +10,12 @@ module EE
extend
::
Gitlab
::
Utils
::
Override
extend
::
Gitlab
::
Utils
::
Override
extend
::
Gitlab
::
Cache
::
RequestCache
extend
::
Gitlab
::
Cache
::
RequestCache
include
::
Gitlab
::
Utils
::
StrongMemoize
include
::
Gitlab
::
Utils
::
StrongMemoize
include
::
EE
::
GitlabRoutingHelper
# rubocop: disable Cop/InjectEnterpriseEditionModule
include
IgnorableColumns
include
IgnorableColumns
GIT_LFS_DOWNLOAD_OPERATION
=
'download'
.
freeze
GIT_LFS_DOWNLOAD_OPERATION
=
'download'
.
freeze
prepended
do
prepended
do
include
Elastic
::
ProjectsSearch
include
Elastic
::
ProjectsSearch
include
EE
::
DeploymentPlatform
# rubocop: disable Cop/InjectEnterpriseEditionModule
include
EachBatch
include
EachBatch
include
InsightsFeature
include
InsightsFeature
include
DeprecatedApprovalsBeforeMerge
include
DeprecatedApprovalsBeforeMerge
...
@@ -784,3 +782,6 @@ module EE
...
@@ -784,3 +782,6 @@ module EE
end
end
end
end
end
end
EE
::
Project
.
include_if_ee
(
'::EE::GitlabRoutingHelper'
)
EE
::
Project
.
include_if_ee
(
'::EE::DeploymentPlatform'
)
ee/app/presenters/ee/merge_request_presenter.rb
View file @
6ef24415
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
module
EE
module
EE
module
MergeRequestPresenter
module
MergeRequestPresenter
include
::
VisibleApprovable
include
::
VisibleApprovable
include
::
EE
::
ProjectsHelper
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
approvals_path
def
approvals_path
if
expose_mr_approval_path?
if
expose_mr_approval_path?
...
@@ -72,3 +71,5 @@ module EE
...
@@ -72,3 +71,5 @@ module EE
end
end
end
end
end
end
EE
::
MergeRequestPresenter
.
include_if_ee
(
'::EE::ProjectsHelper'
)
ee/app/serializers/vulnerabilities/finding_entity.rb
View file @
6ef24415
# frozen_string_literal: true
# frozen_string_literal: true
class
Vulnerabilities::FindingEntity
<
Grape
::
Entity
class
Vulnerabilities::FindingEntity
<
Grape
::
Entity
include
::
EE
::
ProjectsHelper
# rubocop: disable Cop/InjectEnterpriseEditionModule
include
RequestAwareEntity
include
RequestAwareEntity
expose
:id
,
:report_type
,
:name
,
:severity
,
:confidence
expose
:id
,
:report_type
,
:name
,
:severity
,
:confidence
...
@@ -44,3 +43,5 @@ class Vulnerabilities::FindingEntity < Grape::Entity
...
@@ -44,3 +43,5 @@ class Vulnerabilities::FindingEntity < Grape::Entity
return
request
.
current_user
if
request
.
respond_to?
(
:current_user
)
return
request
.
current_user
if
request
.
respond_to?
(
:current_user
)
end
end
end
end
Vulnerabilities
::
FindingEntity
.
include_if_ee
(
'::EE::ProjectsHelper'
)
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