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
875ce488
Commit
875ce488
authored
Aug 03, 2017
by
Filipa Lacerda
Committed by
James Edwards-Jones
Aug 11, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'fix-oauth-checkboxes' into 'master'
Fixed sign-in restrictions buttons not toggling active state Closes #35882 See merge request !13270
parent
030d7091
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
bootstrap.js
app/assets/javascripts/commons/bootstrap.js
+1
-0
fix-oauth-checkboxes.yml
changelogs/unreleased/fix-oauth-checkboxes.yml
+4
-0
admin_settings_spec.rb
spec/features/admin/admin_settings_spec.rb
+8
-0
No files found.
app/assets/javascripts/commons/bootstrap.js
View file @
875ce488
...
@@ -8,6 +8,7 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/modal';
...
@@ -8,6 +8,7 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/modal';
import
'bootstrap-sass/assets/javascripts/bootstrap/tab'
;
import
'bootstrap-sass/assets/javascripts/bootstrap/tab'
;
import
'bootstrap-sass/assets/javascripts/bootstrap/transition'
;
import
'bootstrap-sass/assets/javascripts/bootstrap/transition'
;
import
'bootstrap-sass/assets/javascripts/bootstrap/tooltip'
;
import
'bootstrap-sass/assets/javascripts/bootstrap/tooltip'
;
import
'bootstrap-sass/assets/javascripts/bootstrap/button'
;
// custom jQuery functions
// custom jQuery functions
$
.
fn
.
extend
({
$
.
fn
.
extend
({
...
...
changelogs/unreleased/fix-oauth-checkboxes.yml
0 → 100644
View file @
875ce488
---
title
:
Fixed sign-in restrictions buttons not toggling active state
merge_request
:
author
:
spec/features/admin/admin_settings_spec.rb
View file @
875ce488
...
@@ -69,6 +69,14 @@ feature 'Admin updates settings', feature: true do
...
@@ -69,6 +69,14 @@ feature 'Admin updates settings', feature: true do
expect
(
find
(
'#service_push_channel'
).
value
).
to
eq
'#test_channel'
expect
(
find
(
'#service_push_channel'
).
value
).
to
eq
'#test_channel'
end
end
context
'sign-in restrictions'
,
:js
do
it
'de-activates oauth sign-in source'
do
find
(
'.btn'
,
text:
'GitLab.com'
).
click
expect
(
find
(
'.btn'
,
text:
'GitLab.com'
)).
not_to
have_css
(
'.active'
)
end
end
def
check_all_events
def
check_all_events
page
.
check
(
'Active'
)
page
.
check
(
'Active'
)
page
.
check
(
'Push'
)
page
.
check
(
'Push'
)
...
...
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