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
9fc84d1c
Commit
9fc84d1c
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 - 2
parent
0a49a02f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
12 deletions
+17
-12
changelogs/unreleased/lib-gitlab-refactoring-2.yml
changelogs/unreleased/lib-gitlab-refactoring-2.yml
+5
-0
lib/gitlab/ci/status/build/failed.rb
lib/gitlab/ci/status/build/failed.rb
+2
-2
lib/gitlab/email/handler.rb
lib/gitlab/email/handler.rb
+2
-2
lib/gitlab/github_import/parallel_importer.rb
lib/gitlab/github_import/parallel_importer.rb
+2
-2
lib/gitlab/import_export/project/relation_factory.rb
lib/gitlab/import_export/project/relation_factory.rb
+2
-2
lib/gitlab/middleware/read_only/controller.rb
lib/gitlab/middleware/read_only/controller.rb
+2
-2
lib/gitlab/omniauth_initializer.rb
lib/gitlab/omniauth_initializer.rb
+2
-2
No files found.
changelogs/unreleased/lib-gitlab-refactoring-2.yml
0 → 100644
View file @
9fc84d1c
---
title
:
Move prepend to last line in lib/gitlab files
merge_request
:
30070
author
:
Rajendra Kadam
type
:
fixed
lib/gitlab/ci/status/build/failed.rb
View file @
9fc84d1c
...
...
@@ -29,8 +29,6 @@ module Gitlab
private_constant
:REASONS
prepend_if_ee
(
'::EE::Gitlab::Ci::Status::Build::Failed'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
status_tooltip
base_message
end
...
...
@@ -65,3 +63,5 @@ module Gitlab
end
end
end
Gitlab
::
Ci
::
Status
::
Build
::
Failed
.
prepend_if_ee
(
'::EE::Gitlab::Ci::Status::Build::Failed'
)
lib/gitlab/email/handler.rb
View file @
9fc84d1c
...
...
@@ -3,8 +3,6 @@
module
Gitlab
module
Email
module
Handler
prepend_if_ee
(
'::EE::Gitlab::Email::Handler'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
self
.
handlers
@handlers
||=
load_handlers
end
...
...
@@ -27,3 +25,5 @@ module Gitlab
end
end
end
Gitlab
::
Email
::
Handler
.
prepend_if_ee
(
'::EE::Gitlab::Email::Handler'
)
lib/gitlab/github_import/parallel_importer.rb
View file @
9fc84d1c
...
...
@@ -5,8 +5,6 @@ module Gitlab
# The ParallelImporter schedules the importing of a GitHub project using
# Sidekiq.
class
ParallelImporter
prepend_if_ee
(
'::EE::Gitlab::GithubImport::ParallelImporter'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader
:project
def
self
.
async?
...
...
@@ -41,3 +39,5 @@ module Gitlab
end
end
end
Gitlab
::
GithubImport
::
ParallelImporter
.
prepend_if_ee
(
'::EE::Gitlab::GithubImport::ParallelImporter'
)
lib/gitlab/import_export/project/relation_factory.rb
View file @
9fc84d1c
...
...
@@ -4,8 +4,6 @@ module Gitlab
module
ImportExport
module
Project
class
RelationFactory
<
Base
::
RelationFactory
prepend_if_ee
(
'::EE::Gitlab::ImportExport::Project::RelationFactory'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
OVERRIDES
=
{
snippets: :project_snippets
,
ci_pipelines:
'Ci::Pipeline'
,
pipelines:
'Ci::Pipeline'
,
...
...
@@ -161,3 +159,5 @@ module Gitlab
end
end
end
Gitlab
::
ImportExport
::
Project
::
RelationFactory
.
prepend_if_ee
(
'::EE::Gitlab::ImportExport::Project::RelationFactory'
)
lib/gitlab/middleware/read_only/controller.rb
View file @
9fc84d1c
...
...
@@ -4,8 +4,6 @@ module Gitlab
module
Middleware
class
ReadOnly
class
Controller
prepend_if_ee
(
'EE::Gitlab::Middleware::ReadOnly::Controller'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
DISALLOWED_METHODS
=
%w(POST PATCH PUT DELETE)
.
freeze
APPLICATION_JSON
=
'application/json'
APPLICATION_JSON_TYPES
=
%W{
#{
APPLICATION_JSON
}
application/vnd.git-lfs+json}
.
freeze
...
...
@@ -144,3 +142,5 @@ module Gitlab
end
end
end
Gitlab
::
Middleware
::
ReadOnly
::
Controller
.
prepend_if_ee
(
'EE::Gitlab::Middleware::ReadOnly::Controller'
)
lib/gitlab/omniauth_initializer.rb
View file @
9fc84d1c
...
...
@@ -2,8 +2,6 @@
module
Gitlab
class
OmniauthInitializer
prepend_if_ee
(
'::EE::Gitlab::OmniauthInitializer'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
initialize
(
devise_config
)
@devise_config
=
devise_config
end
...
...
@@ -121,3 +119,5 @@ module Gitlab
end
end
end
Gitlab
::
OmniauthInitializer
.
prepend_if_ee
(
'::EE::Gitlab::OmniauthInitializer'
)
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