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
65278c75
Commit
65278c75
authored
4 years ago
by
Rajendra Kadam
Committed by
Peter Leitzen
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move prepend to the last line in lib gitlab files - 4
parent
0a49a02f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
10 deletions
+15
-10
changelogs/unreleased/lib-gitlab-refactoring-4.yml
changelogs/unreleased/lib-gitlab-refactoring-4.yml
+5
-0
lib/gitlab/auth/ldap/person.rb
lib/gitlab/auth/ldap/person.rb
+2
-2
lib/gitlab/auth/ldap/user.rb
lib/gitlab/auth/ldap/user.rb
+2
-2
lib/gitlab/auth/o_auth/auth_hash.rb
lib/gitlab/auth/o_auth/auth_hash.rb
+2
-2
lib/gitlab/auth/o_auth/user.rb
lib/gitlab/auth/o_auth/user.rb
+2
-2
lib/gitlab/auth/result.rb
lib/gitlab/auth/result.rb
+2
-2
No files found.
changelogs/unreleased/lib-gitlab-refactoring-4.yml
0 → 100644
View file @
65278c75
---
title
:
Move prepend to last line in lib/gitlab files
merge_request
:
30289
author
:
Rajendra Kadam
type
:
fixed
This diff is collapsed.
Click to expand it.
lib/gitlab/auth/ldap/person.rb
View file @
65278c75
...
...
@@ -4,8 +4,6 @@ module Gitlab
module
Auth
module
Ldap
class
Person
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::Person'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
# Active Directory-specific LDAP filter that checks if bit 2 of the
# userAccountControl attribute is set.
# Source: http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/
...
...
@@ -122,3 +120,5 @@ module Gitlab
end
end
end
Gitlab
::
Auth
::
Ldap
::
Person
.
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::Person'
)
This diff is collapsed.
Click to expand it.
lib/gitlab/auth/ldap/user.rb
View file @
65278c75
...
...
@@ -11,8 +11,6 @@ module Gitlab
module
Ldap
class
User
<
Gitlab
::
Auth
::
OAuth
::
User
extend
::
Gitlab
::
Utils
::
Override
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::User'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
class
<<
self
# rubocop: disable CodeReuse/ActiveRecord
def
find_by_uid_and_provider
(
uid
,
provider
)
...
...
@@ -64,3 +62,5 @@ module Gitlab
end
end
end
Gitlab
::
Auth
::
Ldap
::
User
.
prepend_if_ee
(
'::EE::Gitlab::Auth::Ldap::User'
)
This diff is collapsed.
Click to expand it.
lib/gitlab/auth/o_auth/auth_hash.rb
View file @
65278c75
...
...
@@ -6,8 +6,6 @@ module Gitlab
module
Auth
module
OAuth
class
AuthHash
prepend_if_ee
(
'::EE::Gitlab::Auth::OAuth::AuthHash'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader
:auth_hash
def
initialize
(
auth_hash
)
@auth_hash
=
auth_hash
...
...
@@ -93,3 +91,5 @@ module Gitlab
end
end
end
Gitlab
::
Auth
::
OAuth
::
AuthHash
.
prepend_if_ee
(
'::EE::Gitlab::Auth::OAuth::AuthHash'
)
This diff is collapsed.
Click to expand it.
lib/gitlab/auth/o_auth/user.rb
View file @
65278c75
...
...
@@ -9,8 +9,6 @@ module Gitlab
module
Auth
module
OAuth
class
User
prepend_if_ee
(
'::EE::Gitlab::Auth::OAuth::User'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
SignupDisabledError
=
Class
.
new
(
StandardError
)
SigninDisabledForProviderError
=
Class
.
new
(
StandardError
)
...
...
@@ -275,3 +273,5 @@ module Gitlab
end
end
end
Gitlab
::
Auth
::
OAuth
::
User
.
prepend_if_ee
(
'::EE::Gitlab::Auth::OAuth::User'
)
This diff is collapsed.
Click to expand it.
lib/gitlab/auth/result.rb
View file @
65278c75
...
...
@@ -3,8 +3,6 @@
module
Gitlab
module
Auth
Result
=
Struct
.
new
(
:actor
,
:project
,
:type
,
:authentication_abilities
)
do
prepend_if_ee
(
'::EE::Gitlab::Auth::Result'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
ci?
(
for_project
)
type
==
:ci
&&
project
&&
...
...
@@ -26,3 +24,5 @@ module Gitlab
end
end
end
Gitlab
::
Auth
::
Result
.
prepend_if_ee
(
'::EE::Gitlab::Auth::Result'
)
This diff is collapsed.
Click to expand it.
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