Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 3 deletions

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 4e4f99f09e7..9ba429c3d20 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
@@ -920,8 +920,8 @@ describe('ReadyToMerge', () => {
     });
   });
 
-  describe('Commit message area', () => {
-    describe('when using merge commits', () => {
+  describe('Merge request project settings', () => {
+    describe('when the merge commit merge method is enabled', () => {
       beforeEach(() => {
         vm = createComponent({
           mr: { ffOnlyEnabled: false },
@@ -937,7 +937,7 @@ describe('ReadyToMerge', () => {
       });
     });
 
-    describe('when fast-forward merge is enabled', () => {
+    describe('when the fast-forward merge method is enabled', () => {
       beforeEach(() => {
         vm = createComponent({
           mr: { ffOnlyEnabled: true },