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
709011d7
Commit
709011d7
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 - 5
parent
0a49a02f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
8 deletions
+13
-8
changelogs/unreleased/lib-gitlab-refactoring-5.yml
changelogs/unreleased/lib-gitlab-refactoring-5.yml
+5
-0
lib/gitlab/auth/auth_finders.rb
lib/gitlab/auth/auth_finders.rb
+2
-2
lib/gitlab/auth/ldap/access.rb
lib/gitlab/auth/ldap/access.rb
+2
-2
lib/gitlab/auth/ldap/adapter.rb
lib/gitlab/auth/ldap/adapter.rb
+2
-2
lib/gitlab/auth/ldap/config.rb
lib/gitlab/auth/ldap/config.rb
+2
-2
No files found.
changelogs/unreleased/lib-gitlab-refactoring-5.yml
0 → 100644
View file @
709011d7
---
title
:
Move prepend to last line in lib/gitlab files
merge_request
:
30291
author
:
Rajendra Kadam
type
:
fixed
lib/gitlab/auth/auth_finders.rb
View file @
709011d7
...
@@ -18,8 +18,6 @@ module Gitlab
...
@@ -18,8 +18,6 @@ module Gitlab
end
end
module
AuthFinders
module
AuthFinders
prepend_if_ee
(
'::EE::Gitlab::Auth::AuthFinders'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
include
Gitlab
::
Utils
::
StrongMemoize
include
Gitlab
::
Utils
::
StrongMemoize
include
ActionController
::
HttpAuthentication
::
Basic
include
ActionController
::
HttpAuthentication
::
Basic
...
@@ -249,3 +247,5 @@ module Gitlab
...
@@ -249,3 +247,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
Auth
::
AuthFinders
.
prepend_if_ee
(
'::EE::Gitlab::Auth::AuthFinders'
)
lib/gitlab/auth/ldap/access.rb
View file @
709011d7
...
@@ -8,8 +8,6 @@ module Gitlab
...
@@ -8,8 +8,6 @@ module Gitlab
module
Auth
module
Auth
module
Ldap
module
Ldap
class
Access
class
Access
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::Access'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader
:provider
,
:user
,
:ldap_identity
attr_reader
:provider
,
:user
,
:ldap_identity
def
self
.
open
(
user
,
&
block
)
def
self
.
open
(
user
,
&
block
)
...
@@ -118,3 +116,5 @@ module Gitlab
...
@@ -118,3 +116,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
Auth
::
Ldap
::
Access
.
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::Access'
)
lib/gitlab/auth/ldap/adapter.rb
View file @
709011d7
...
@@ -4,8 +4,6 @@ module Gitlab
...
@@ -4,8 +4,6 @@ module Gitlab
module
Auth
module
Auth
module
Ldap
module
Ldap
class
Adapter
class
Adapter
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::Adapter'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
SEARCH_RETRY_FACTOR
=
[
1
,
1
,
2
,
3
].
freeze
SEARCH_RETRY_FACTOR
=
[
1
,
1
,
2
,
3
].
freeze
MAX_SEARCH_RETRIES
=
Rails
.
env
.
test?
?
1
:
SEARCH_RETRY_FACTOR
.
size
.
freeze
MAX_SEARCH_RETRIES
=
Rails
.
env
.
test?
?
1
:
SEARCH_RETRY_FACTOR
.
size
.
freeze
...
@@ -142,3 +140,5 @@ module Gitlab
...
@@ -142,3 +140,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
Auth
::
Ldap
::
Adapter
.
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::Adapter'
)
lib/gitlab/auth/ldap/config.rb
View file @
709011d7
...
@@ -5,8 +5,6 @@ module Gitlab
...
@@ -5,8 +5,6 @@ module Gitlab
module
Auth
module
Auth
module
Ldap
module
Ldap
class
Config
class
Config
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::Config'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
NET_LDAP_ENCRYPTION_METHOD
=
{
NET_LDAP_ENCRYPTION_METHOD
=
{
simple_tls: :simple_tls
,
simple_tls: :simple_tls
,
start_tls: :start_tls
,
start_tls: :start_tls
,
...
@@ -288,3 +286,5 @@ module Gitlab
...
@@ -288,3 +286,5 @@ module Gitlab
end
end
end
end
end
end
Gitlab
::
Auth
::
Ldap
::
Config
.
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::Config'
)
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