Add latest changes from gitlab-org/gitlab@master

4 files changed, 36 insertions, 19 deletions

diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml
index ca5109614fc..978e830d0e4 100644
--- a/app/views/admin/users/_user.html.haml
+++ b/app/views/admin/users/_user.html.haml
@@ -19,8 +19,8 @@
       = link_to _('Edit'), edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: 'btn btn-default'
       - unless user == current_user
         %button.dropdown-new.btn.btn-default{ type: 'button', data: { toggle: 'dropdown' } }
-          = icon('cog')
-          = icon('caret-down')
+          = sprite_icon('settings')
+          = sprite_icon('chevron-down')
         %ul.dropdown-menu.dropdown-menu-right
           %li.dropdown-header
             = _('Settings')
diff --git a/changelogs/unreleased/121931-replace-font-awesome-cog-icon-with-gitlab-settings-icon.yml b/changelogs/unreleased/121931-replace-font-awesome-cog-icon-with-gitlab-settings-icon.yml
new file mode 100644
index 00000000000..fedd90efd09
--- /dev/null
+++ b/changelogs/unreleased/121931-replace-font-awesome-cog-icon-with-gitlab-settings-icon.yml
@@ -0,0 +1,5 @@
+---
+title: Replace Font Awesome cog icon with GitLab settings icon
+merge_request: 22259
+author:
+type: other
diff --git a/doc/ci/review_apps/index.md b/doc/ci/review_apps/index.md
index 0da1228aa53..23cb0362867 100644
--- a/doc/ci/review_apps/index.md
+++ b/doc/ci/review_apps/index.md
@@ -167,7 +167,7 @@ Ensure that the `anonymous_visual_review_feedback` feature flag is enabled.
 Administrators can enable with a Rails console as follows:
 
 ```ruby
-Feature.enabled(:anonymous_visual_review_feedback)
+Feature.enable(:anonymous_visual_review_feedback)
 ```
 
 The feedback form is served through a script you add to pages in your Review App.
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
index a2fa098bf6b..6c44ffc6ec9 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -634,20 +634,18 @@ describe('ReadyToMerge', () => {
     });
 
     describe('when user can merge and can delete branch', () => {
-      let customVm;
-
       beforeEach(() => {
-        customVm = createComponent({
+        vm = createComponent({
           mr: { canRemoveSourceBranch: true },
         });
       });
 
       it('isRemoveSourceBranchButtonDisabled should be false', () => {
-        expect(customVm.isRemoveSourceBranchButtonDisabled).toBe(false);
+        expect(vm.isRemoveSourceBranchButtonDisabled).toBe(false);
       });
 
-      it('should be enabled in rendered output', () => {
-        const checkboxElement = customVm.$el.querySelector('#remove-source-branch-input');
+      it('removed source branch should be enabled in rendered output', () => {
+        const checkboxElement = vm.$el.querySelector('#remove-source-branch-input');
 
         expect(checkboxElement).not.toBeNull();
       });
@@ -926,22 +924,36 @@ describe('ReadyToMerge', () => {
   });
 
   describe('Commit message area', () => {
-    it('when using merge commits, should show "Modify commit message" button', () => {
-      const customVm = createComponent({
-        mr: { ffOnlyEnabled: false },
+    describe('when using merge commits', () => {
+      beforeEach(() => {
+        vm = createComponent({
+          mr: { ffOnlyEnabled: false },
+        });
+      });
+
+      it('should not show fast forward message', () => {
+        expect(vm.$el.querySelector('.mr-fast-forward-message')).toBeNull();
       });
 
-      expect(customVm.$el.querySelector('.mr-fast-forward-message')).toBeNull();
-      expect(customVm.$el.querySelector('.js-modify-commit-message-button')).toBeDefined();
+      it('should show "Modify commit message" button', () => {
+        expect(vm.$el.querySelector('.js-modify-commit-message-button')).toBeDefined();
+      });
     });
 
-    it('when fast-forward merge is enabled, only show fast-forward message', () => {
-      const customVm = createComponent({
-        mr: { ffOnlyEnabled: true },
+    describe('when fast-forward merge is enabled', () => {
+      beforeEach(() => {
+        vm = createComponent({
+          mr: { ffOnlyEnabled: true },
+        });
+      });
+
+      it('should show fast forward message', () => {
+        expect(vm.$el.querySelector('.mr-fast-forward-message')).toBeDefined();
       });
 
-      expect(customVm.$el.querySelector('.mr-fast-forward-message')).toBeDefined();
-      expect(customVm.$el.querySelector('.js-modify-commit-message-button')).toBeNull();
+      it('should not show "Modify commit message" button', () => {
+        expect(vm.$el.querySelector('.js-modify-commit-message-button')).toBeNull();
+      });
     });
   });