Merge branch 'fix-oauth-checkboxes' into 'master'

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({

changelogs/unreleased/fix-oauth-checkboxes.yml

+---
+title: Fixed sign-in restrictions buttons not toggling active state
+merge_request:
+author:

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')