From 52c772f9c3055e599eb05530f9acb6648696d1fb Mon Sep 17 00:00:00 2001
From: Natalia Tepluhina <ntepluhina@gitlab.com>
Date: Thu, 7 Mar 2019 09:26:31 +0000
Subject: [PATCH] Added a condition on squash message display

- also added a caret back to GlDropdown
---
 .../states/commit_message_dropdown.vue        |  1 -
 .../components/states/ready_to_merge.vue      |  2 +-
 .../unreleased/58369-hide-squash-commit.yml   |  5 +++++
 .../states/mr_widget_ready_to_merge_spec.js   | 20 ++++++++++++++++---
 4 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 changelogs/unreleased/58369-hide-squash-commit.yml

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue
index b3c1c0e329d..b6722de5277 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue
@@ -20,7 +20,6 @@ export default {
   <div>
     <gl-dropdown
       right
-      no-caret
       text="Use an existing commit message"
       variant="link"
       class="mr-commit-dropdown"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index ce4207864ea..9b4e80ee3a3 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -329,7 +329,7 @@ export default {
         >
           <ul class="border-top content-list commits-list flex-list">
             <commit-edit
-              v-if="squashBeforeMerge"
+              v-if="squashBeforeMerge && shouldShowSquashBeforeMerge"
               v-model="squashCommitMessage"
               :label="__('Squash commit message')"
               input-id="squash-message-edit"
diff --git a/changelogs/unreleased/58369-hide-squash-commit.yml b/changelogs/unreleased/58369-hide-squash-commit.yml
new file mode 100644
index 00000000000..e44b483b3a1
--- /dev/null
+++ b/changelogs/unreleased/58369-hide-squash-commit.yml
@@ -0,0 +1,5 @@
+---
+title: Resolve showing squash commit edit issue when only single commit is present
+merge_request: 25807
+author:
+type: fixed
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 631da202d1d..08e173b0a10 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
@@ -673,7 +673,7 @@ describe('ReadyToMerge', () => {
           .at(0)
           .props('label');
 
-      it('should have two edit components when squash is enabled', () => {
+      it('should have two edit components when squash is enabled and there is more than 1 commit', () => {
         createLocalComponent({
           mr: {
             commitsCount: 2,
@@ -685,6 +685,18 @@ describe('ReadyToMerge', () => {
         expect(findCommitEditElements().length).toBe(2);
       });
 
+      it('should have one edit components when squash is enabled and there is 1 commit only', () => {
+        createLocalComponent({
+          mr: {
+            commitsCount: 1,
+            squash: true,
+            enableSquashBeforeMerge: true,
+          },
+        });
+
+        expect(findCommitEditElements().length).toBe(1);
+      });
+
       it('should have correct edit merge commit label', () => {
         createLocalComponent();
 
@@ -711,8 +723,10 @@ describe('ReadyToMerge', () => {
         expect(findCommitDropdownElement().exists()).toBeFalsy();
       });
 
-      it('should  be rendered if squash is enabled', () => {
-        createLocalComponent({ mr: { squash: true } });
+      it('should  be rendered if squash is enabled and there is more than 1 commit', () => {
+        createLocalComponent({
+          mr: { enableSquashBeforeMerge: true, squash: true, commitsCount: 2 },
+        });
 
         expect(findCommitDropdownElement().exists()).toBeTruthy();
       });