BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
318812ff
Commit
318812ff
authored
May 10, 2018
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove accidental EE additions in CE
parent
bbc53f2b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
51 deletions
+0
-51
omniauth_callbacks_controller.rb
ee/app/controllers/ee/ldap/omniauth_callbacks_controller.rb
+0
-22
omniauth_callbacks_controller_spec.rb
...ec/controllers/ldap/omniauth_callbacks_controller_spec.rb
+0
-29
No files found.
ee/app/controllers/ee/ldap/omniauth_callbacks_controller.rb
deleted
100644 → 0
View file @
bbc53f2b
module
EE
module
Ldap
module
OmniauthCallbacksController
extend
::
Gitlab
::
Utils
::
Override
override
:sign_in_and_redirect
def
sign_in_and_redirect
(
user
)
# The counter gets incremented in `sign_in_and_redirect`
show_ldap_sync_flash
if
user
.
sign_in_count
==
0
super
end
private
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
end
end
ee/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb
deleted
100644 → 0
View file @
bbc53f2b
require
'spec_helper'
describe
Ldap
::
OmniauthCallbacksController
do
include_context
'Ldap::OmniauthCallbacksController'
it
"displays LDAP sync flash on first sign in"
do
post
provider
expect
(
flash
[
:notice
]).
to
match
(
/LDAP sync in progress*/
)
end
it
"skips LDAP sync flash on subsequent sign ins"
do
user
.
update!
(
sign_in_count:
1
)
post
provider
expect
(
flash
[
:notice
]).
to
eq
nil
end
context
'access denied'
do
let
(
:valid_login?
)
{
false
}
it
'logs a failure event'
do
stub_licensed_features
(
extended_audit_events:
true
)
expect
{
post
provider
}.
to
change
(
SecurityEvent
,
:count
).
by
(
1
)
end
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