Merge branch 'master' into widget-widget-widget-fun

* master: (163 commits)
  Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM
  Remove useless assignment
  Rename query parameter to `membership`
  Stop setting Strict-Transport-Securty header from within the app
  Add filter param for authorized projects for current_user for V4
  Improve EE compatibility MR docs [ci skip]
  Fix the `Gitlab::Seeder` monkey patch to disable mail delivery
  Use separate error class for cherry-pick and revert tree errors
  Fix cherry-picking or reverting through an MR
  Resolve "missing count badge styling in new sidebar dropdown"
  Fix Rubocop offense in build retry service
  Decrease tanuki logo size
  remove extra whitespace on dashboard projects page
  Changes after review
  Delete hooks from project with empty repository
  Only add a newline in Markdown Editor if the current line is not empty
  Revert "Disallow system notes for closed issuables"
  Cleaning up navigational order - Project
  Backport EE changes. Service method should be `get` and not `all`
  Remove bundle-audit ignores that are no longer applicable
  ...

1 files changed, 7 insertions, 1 deletions

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index ad585ff2892..a849d93331b 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -28,7 +28,7 @@
         background-color: $gl-success;
       }
 
-      .accept_merge_request {
+      .accept-merge-request {
         &.ci-pending,
         &.ci-running {
           @include btn-blue;
@@ -41,6 +41,12 @@
           @include btn-red;
         }
       }
+
+      .dropdown-toggle {
+        .fa {
+          color: inherit;
+        }
+      }
     }
 
     .accept-control {