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
a4d09bda
Commit
a4d09bda
authored
Feb 22, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Satsify new cop for EE
parent
618e3ae8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
app/controllers/groups/ldap_group_links_controller.rb
app/controllers/groups/ldap_group_links_controller.rb
+1
-3
lib/gitlab/geo.rb
lib/gitlab/geo.rb
+1
-1
No files found.
app/controllers/groups/ldap_group_links_controller.rb
View file @
a4d09bda
...
...
@@ -32,9 +32,7 @@ class Groups::LdapGroupLinksController < Groups::ApplicationController
private
def
require_ldap_enabled
unless
Gitlab
.
config
.
ldap
.
enabled
render_404
and
return
end
render_404
unless
Gitlab
.
config
.
ldap
.
enabled
end
def
ldap_group_link_params
...
...
lib/gitlab/geo.rb
View file @
a4d09bda
...
...
@@ -50,7 +50,7 @@ module Gitlab
return
false
unless
Gitlab
::
Geo
.
secondary?
self
.
cache_value
(
:geo_oauth_application
)
do
Gitlab
::
Geo
.
current_node
.
oauth_application
or
raise
OauthApplicationUndefinedError
Gitlab
::
Geo
.
current_node
.
oauth_application
||
raise
(
OauthApplicationUndefinedError
)
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