Merge branch '65705-two-buttons' into 'master'

Removes duplicate button from job log page

Closes #65705

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

app/assets/javascripts/jobs/components/empty_state.vue

@@ -81,7 +81,7 @@ export default {
         :variables-settings-url="variablesSettingsUrl"
       />
       <div class="text-content">
-        <div v-if="action" class="text-center">
+        <div v-if="action && !shouldRenderManualVariables" class="text-center">
           <gl-link
             :href="action.path"
             :data-method="action.method"

changelogs/unreleased/65705-two-buttons.yml

+---
+title: Prevent duplicated trigger action button
+merge_request:
+author:
+type: fixed

spec/frontend/jobs/components/empty_state_spec.js → spec/javascripts/jobs/components/empty_state_spec.js

@@ -105,7 +105,7 @@ describe('Empty State', () => {
   });
 
   describe('with playbale action and not scheduled job', () => {
-    it('renders manual variables form', () => {
+    beforeEach(() => {
       vm = mountComponent(Component, {
         ...props,
         content,
@@ -117,9 +117,15 @@ describe('Empty State', () => {
           method: 'post',
         },
       });
+    });
 
+    it('renders manual variables form', () => {
       expect(vm.$el.querySelector('.js-manual-vars-form')).not.toBeNull();
     });
+
+    it('does not render the empty state action', () => {
+      expect(vm.$el.querySelector('.js-job-empty-state-action')).toBeNull();
+    });
   });
 
   describe('with playbale action and  scheduled job', () => {