diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-03 16:03:23 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-08-11 20:29:58 +0100 |
| commit | 875ce488b530cf240c40daf0112bee4ef2779ee1 (patch) | |
| tree | 2e6b9c0cbe95c866c122d98f34bcee18aadaa175 | |
| parent | 030d7091548bb2cc8dde17bfe99367dc2c3b36a3 (diff) | |
| download | gitlab-ce-875ce488b530cf240c40daf0112bee4ef2779ee1.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 36bfe457be9..d7a61266231 100644 --- a/app/assets/javascripts/commons/bootstrap.js +++ b/app/assets/javascripts/commons/bootstrap.js @@ -8,6 +8,7 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/modal'; 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/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 a44fa0b86d5..46c8546c21d 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', feature: true 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') |