Merge branch 'ce-1979-fe-multiple-approval-rules' into 'master'

CE Port of Multiple merge request approval rules

See merge request gitlab-org/gitlab-ce!25193

app/assets/stylesheets/framework/buttons.scss

@@ -166,7 +166,8 @@
       @include btn-outline($white-light, $green-600, $green-500, $green-500, $white-light, $green-600, $green-600, $green-700);
     }
 
-    &.btn-remove {
+    &.btn-remove,
+    &.btn-danger {
       @include btn-outline($white-light, $red-500, $red-500, $red-500, $white-light, $red-600, $red-600, $red-700);
     }
 

spec/features/merge_request/user_creates_merge_request_spec.rb

@@ -8,6 +8,8 @@ describe "User creates a merge request", :js do
   let(:user) { create(:user) }
 
   before do
+    stub_feature_flags(approval_rules: false)
+
     project.add_maintainer(user)
     sign_in(user)
   end

spec/features/projects/settings/forked_project_settings_spec.rb

@@ -7,6 +7,7 @@ describe 'Projects > Settings > For a forked project', :js do
   let(:forked_project) { fork_project(original_project, user) }
 
   before do
+    stub_feature_flags(approval_rules: false)
     original_project.add_maintainer(user)
     forked_project.add_maintainer(user)
     sign_in(user)

spec/features/projects_spec.rb

@@ -4,6 +4,10 @@ describe 'Project' do
   include ProjectForksHelper
   include MobileHelpers
 
+  before do
+    stub_feature_flags(approval_rules: false)
+  end
+
   describe 'creating from template' do
     let(:user) { create(:user) }
     let(:template) { Gitlab::ProjectTemplate.find(:rails) }

spec/javascripts/vue_mr_widget/mr_widget_options_spec.js

@@ -21,6 +21,7 @@ describe('mrWidgetOptions', () => {
   const COLLABORATION_MESSAGE = 'Allows commits from members who can merge to the target branch';
 
   beforeEach(() => {
+    gon.features = { approvalRules: false };
     // Prevent component mounting
     delete mrWidgetOptions.el;
 
@@ -31,6 +32,7 @@ describe('mrWidgetOptions', () => {
   });
 
   afterEach(() => {
+    gon.features = null;
     vm.$destroy();
   });