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
407b8ea9
Commit
407b8ea9
authored
Apr 28, 2020
by
Rajendra Kadam
Committed by
Peter Leitzen
Apr 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move prepend to the last line in lib gitlab files - 1
parent
0a49a02f
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
11 deletions
+17
-11
changelogs/unreleased/lib-gitlab-refactoring.yml
changelogs/unreleased/lib-gitlab-refactoring.yml
+5
-0
lib/gitlab/patch/draw_route.rb
lib/gitlab/patch/draw_route.rb
+2
-2
lib/gitlab/prometheus/metric_group.rb
lib/gitlab/prometheus/metric_group.rb
+2
-1
lib/gitlab/prometheus/queries/query_additional_metrics.rb
lib/gitlab/prometheus/queries/query_additional_metrics.rb
+2
-2
lib/gitlab/search/parsed_query.rb
lib/gitlab/search/parsed_query.rb
+2
-2
lib/gitlab/slash_commands/presenters/issue_base.rb
lib/gitlab/slash_commands/presenters/issue_base.rb
+2
-2
lib/gitlab/tree_summary.rb
lib/gitlab/tree_summary.rb
+2
-2
No files found.
changelogs/unreleased/lib-gitlab-refactoring.yml
0 → 100644
View file @
407b8ea9
---
title
:
Move prepend to last line in lib/gitlab files
merge_request
:
29938
author
:
Rajendra
type
:
fixed
lib/gitlab/patch/draw_route.rb
View file @
407b8ea9
...
@@ -5,8 +5,6 @@
...
@@ -5,8 +5,6 @@
module
Gitlab
module
Gitlab
module
Patch
module
Patch
module
DrawRoute
module
DrawRoute
prepend_if_ee
(
'EE::Gitlab::Patch::DrawRoute'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
RoutesNotFound
=
Class
.
new
(
StandardError
)
RoutesNotFound
=
Class
.
new
(
StandardError
)
def
draw
(
routes_name
)
def
draw
(
routes_name
)
...
@@ -38,3 +36,5 @@ module Gitlab
...
@@ -38,3 +36,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
Patch
::
DrawRoute
.
prepend_if_ee
(
'EE::Gitlab::Patch::DrawRoute'
)
lib/gitlab/prometheus/metric_group.rb
View file @
407b8ea9
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
module
Gitlab
module
Gitlab
module
Prometheus
module
Prometheus
class
MetricGroup
class
MetricGroup
prepend_if_ee
(
'EE::Gitlab::Prometheus::MetricGroup'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
include
ActiveModel
::
Model
include
ActiveModel
::
Model
attr_accessor
:name
,
:priority
,
:metrics
attr_accessor
:name
,
:priority
,
:metrics
...
@@ -31,3 +30,5 @@ module Gitlab
...
@@ -31,3 +30,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
Prometheus
::
MetricGroup
.
prepend_if_ee
(
'EE::Gitlab::Prometheus::MetricGroup'
)
lib/gitlab/prometheus/queries/query_additional_metrics.rb
View file @
407b8ea9
...
@@ -4,8 +4,6 @@ module Gitlab
...
@@ -4,8 +4,6 @@ module Gitlab
module
Prometheus
module
Prometheus
module
Queries
module
Queries
module
QueryAdditionalMetrics
module
QueryAdditionalMetrics
prepend_if_ee
(
'EE::Gitlab::Prometheus::Queries::QueryAdditionalMetrics'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
query_metrics
(
project
,
environment
,
query_context
)
def
query_metrics
(
project
,
environment
,
query_context
)
matched_metrics
(
project
).
map
(
&
query_group
(
query_context
))
matched_metrics
(
project
).
map
(
&
query_group
(
query_context
))
.
select
(
&
method
(
:group_with_any_metrics
))
.
select
(
&
method
(
:group_with_any_metrics
))
...
@@ -99,3 +97,5 @@ module Gitlab
...
@@ -99,3 +97,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
Prometheus
::
Queries
::
QueryAdditionalMetrics
.
prepend_if_ee
(
'EE::Gitlab::Prometheus::Queries::QueryAdditionalMetrics'
)
lib/gitlab/search/parsed_query.rb
View file @
407b8ea9
...
@@ -3,8 +3,6 @@
...
@@ -3,8 +3,6 @@
module
Gitlab
module
Gitlab
module
Search
module
Search
class
ParsedQuery
class
ParsedQuery
prepend_if_ee
(
'EE::Gitlab::Search::ParsedQuery'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader
:term
,
:filters
attr_reader
:term
,
:filters
def
initialize
(
term
,
filters
)
def
initialize
(
term
,
filters
)
...
@@ -25,3 +23,5 @@ module Gitlab
...
@@ -25,3 +23,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
Search
::
ParsedQuery
.
prepend_if_ee
(
'EE::Gitlab::Search::ParsedQuery'
)
lib/gitlab/slash_commands/presenters/issue_base.rb
View file @
407b8ea9
...
@@ -4,8 +4,6 @@ module Gitlab
...
@@ -4,8 +4,6 @@ module Gitlab
module
SlashCommands
module
SlashCommands
module
Presenters
module
Presenters
module
IssueBase
module
IssueBase
prepend_if_ee
(
'EE::Gitlab::SlashCommands::Presenters::IssueBase'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
color
(
issuable
)
def
color
(
issuable
)
issuable
.
open?
?
'#38ae67'
:
'#d22852'
issuable
.
open?
?
'#38ae67'
:
'#d22852'
end
end
...
@@ -51,3 +49,5 @@ module Gitlab
...
@@ -51,3 +49,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
SlashCommands
::
Presenters
::
IssueBase
.
prepend_if_ee
(
'EE::Gitlab::SlashCommands::Presenters::IssueBase'
)
lib/gitlab/tree_summary.rb
View file @
407b8ea9
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
module
Gitlab
module
Gitlab
class
TreeSummary
class
TreeSummary
prepend_if_ee
(
'::EE::Gitlab::TreeSummary'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
include
::
Gitlab
::
Utils
::
StrongMemoize
include
::
Gitlab
::
Utils
::
StrongMemoize
CACHE_EXPIRE_IN
=
1
.
hour
CACHE_EXPIRE_IN
=
1
.
hour
...
@@ -135,3 +133,5 @@ module Gitlab
...
@@ -135,3 +133,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
TreeSummary
.
prepend_if_ee
(
'::EE::Gitlab::TreeSummary'
)
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