diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-03 16:03:23 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-03 16:03:23 +0000 |
| commit | 57aa5d631466e5e2431e54fa450c61b4f1a3ee90 (patch) | |
| tree | c420fa0313a56f2fb0da76c726b3b9657ed6d181 | |
| parent | 8f9b658e3a30e28189f5ef626d32661e08cf23aa (diff) | |
| parent | 42feb55f20a6d2bab2d07f2f32bccb1b4ae28ba8 (diff) | |
| download | gitlab-ce-57aa5d631466e5e2431e54fa450c61b4f1a3ee90.tar.gz | |
Merge branch 'fix-oauth-checkboxes' into 'master'
Fixed sign-in restrictions buttons not toggling active state
Closes #35882
See merge request !13270
| -rw-r--r-- | app/assets/javascripts/commons/bootstrap.js | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-oauth-checkboxes.yml | 4 | ||||
| -rw-r--r-- | spec/features/admin/admin_settings_spec.rb | 8 |
3 files changed, 13 insertions, 0 deletions
diff --git a/app/assets/javascripts/commons/bootstrap.js b/app/assets/javascripts/commons/bootstrap.js index 510bedbf641..389587a2596 100644 --- a/app/assets/javascripts/commons/bootstrap.js +++ b/app/assets/javascripts/commons/bootstrap.js @@ -9,6 +9,7 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/tab'; import 'bootstrap-sass/assets/javascripts/bootstrap/transition'; import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip'; import 'bootstrap-sass/assets/javascripts/bootstrap/popover'; +import 'bootstrap-sass/assets/javascripts/bootstrap/button'; // custom jQuery functions $.fn.extend({ diff --git a/changelogs/unreleased/fix-oauth-checkboxes.yml b/changelogs/unreleased/fix-oauth-checkboxes.yml new file mode 100644 index 00000000000..2839ccc42cb --- /dev/null +++ b/changelogs/unreleased/fix-oauth-checkboxes.yml @@ -0,0 +1,4 @@ +--- +title: Fixed sign-in restrictions buttons not toggling active state +merge_request: +author: diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index c1eced417cf..c9591a7d854 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -69,6 +69,14 @@ feature 'Admin updates settings' do expect(find('#service_push_channel').value).to eq '#test_channel' 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 page.check('Active') page.check('Push') |