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
2012c3cc
Commit
2012c3cc
authored
Jul 03, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only show the LDAP-sync message once
parent
387d1fd0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
app/controllers/omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+7
-2
changelogs/unreleased-ee/mrchrisw-remove-ldap-sync-msg.yml
changelogs/unreleased-ee/mrchrisw-remove-ldap-sync-msg.yml
+4
-0
No files found.
app/controllers/omniauth_callbacks_controller.rb
View file @
2012c3cc
...
...
@@ -35,8 +35,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
prompt_for_two_factor
(
@user
)
else
log_audit_event
(
@user
,
with: :ldap
)
flash
[
:notice
]
=
'LDAP sync in progress. This could take a few minutes. '
\
'Refresh the page to see the changes.'
# The counter only gets incremented in `sign_in_and_redirect`
show_ldap_sync_flash
if
@user
.
sign_in_count
==
0
sign_in_and_redirect
(
@user
)
end
else
...
...
@@ -168,4 +168,9 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
request_params
=
request
.
env
[
'omniauth.params'
]
(
request_params
[
'remember_me'
]
==
'1'
)
if
request_params
.
present?
end
def
show_ldap_sync_flash
flash
[
:notice
]
=
'LDAP sync in progress. This could take a few minutes. '
\
'Refresh the page to see the changes.'
end
end
changelogs/unreleased-ee/mrchrisw-remove-ldap-sync-msg.yml
0 → 100644
View file @
2012c3cc
---
title
:
Only show the LDAP sync banner on first login
merge_request
:
author
:
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