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
948a7a12
Commit
948a7a12
authored
Oct 13, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't change the providername without migrating
parent
f06a60e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-1
config/initializers/7_omniauth.rb
config/initializers/7_omniauth.rb
+1
-0
No files found.
config/initializers/1_settings.rb
View file @
948a7a12
...
...
@@ -62,7 +62,7 @@ if Settings.ldap['enabled'] || Rails.env.test?
if
Settings
.
ldap
[
'host'
].
present?
server
=
Settings
.
ldap
.
except
(
'sync_time'
)
server
[
'label'
]
=
'LDAP'
server
[
'provider_id'
]
=
'
main
'
server
[
'provider_id'
]
=
''
Settings
.
ldap
[
'servers'
]
=
[
server
]
end
...
...
config/initializers/7_omniauth.rb
View file @
948a7a12
module
OmniAuth::Strategies
Gitlab
.
config
.
ldap
.
servers
.
each_with_index
do
|
server
|
next
unless
server
.
provider_id
.
present?
const_set
(
server
.
provider_class
,
Class
.
new
(
LDAP
))
end
end
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