Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/pipelines/components/pipelines_table.vue

@@ -44,6 +44,11 @@ export default {
       cancelingPipeline: null,
     };
   },
+  watch: {
+    pipelines() {
+      this.cancelingPipeline = null;
+    },
+  },
   created() {
     eventHub.$on('openConfirmationModal', this.setModalData);
   },

app/assets/javascripts/pipelines/components/pipelines_table_row.vue

@@ -241,7 +241,11 @@ export default {
       return this.cancelingPipeline === this.pipeline.id;
     },
   },
-
+  watch: {
+    pipeline() {
+      this.isRetrying = false;
+    },
+  },
   methods: {
     handleCancelClick() {
       eventHub.$emit('openConfirmationModal', {

app/assets/javascripts/pipelines/mixins/pipelines.js

@@ -107,8 +107,8 @@ export default {
       }
       // Stop polling
       this.poll.stop();
-      // Update the table
-      return this.getPipelines().then(() => this.poll.restart());
+      // Restarting the poll also makes an initial request
+      this.poll.restart();
     },
     fetchPipelines() {
       if (!this.isMakingRequest) {
@@ -153,7 +153,7 @@ export default {
     postAction(endpoint) {
       this.service
         .postAction(endpoint)
-        .then(() => this.fetchPipelines())
+        .then(() => this.updateTable())
         .catch(() => Flash(__('An error occurred while making the request.')));
     },
   },

app/views/shared/boards/components/_board.html.haml

@@ -19,8 +19,10 @@
           %img.avatar.s20.has-tooltip{ height: "20", width: "20", ":src": "list.assignee.avatar", ":alt": "list.assignee.name" }
 
         .board-title-text
-          %span.board-title-main-text.has-tooltip.block-truncated{ "v-if": "list.type !== \"label\"",
-            ":title" => '((list.label && list.label.description) || list.title || "")', data: { container: "body" } }
+          %span.board-title-main-text.block-truncated{ "v-if": "list.type !== \"label\"",
+            ":title" => '((list.label && list.label.description) || list.title || "")',
+            data: { container: "body" },
+            ":class": "{ 'has-tooltip': !['backlog', 'closed'].includes(list.type) }" }
             {{ list.title }}
 
           %span.board-title-sub-text.prepend-left-5.has-tooltip{ "v-if": "list.type === \"assignee\"",

changelogs/unreleased/63590-pipeline-actions-cause-full-refresh.yml

+---
+title: Fix pipelines table to update without refreshing after action
+merge_request: 30190
+author:
+type: fixed

changelogs/unreleased/mh-board-tooltips.yml

+---
+title: "'Open' and 'Closed' issue board lists no longer display a redundant tooltip"
+merge_request: 30187
+author:
+type: fixed

db/fixtures/development/24_forks.rb

@@ -13,9 +13,9 @@ Sidekiq::Testing.inline! do
       fork_project = Projects::ForkService.new(source_project, user, namespace: user.namespace).execute
 
       if fork_project.valid?
-        puts '.'
+        print '.'
       else
-        puts 'F'
+        print 'F'
       end
     end
   end

spec/javascripts/pipelines/pipelines_spec.js

@@ -736,10 +736,9 @@ describe('Pipelines', () => {
     });
 
     describe('when a request is being made', () => {
-      it('stops polling, cancels the request, fetches pipelines & restarts polling', done => {
+      it('stops polling, cancels the request, & restarts polling', done => {
         spyOn(vm.poll, 'stop');
         spyOn(vm.poll, 'restart');
-        spyOn(vm, 'getPipelines').and.returnValue(Promise.resolve());
         spyOn(vm.service.cancelationSource, 'cancel').and.callThrough();
 
         setTimeout(() => {
@@ -754,7 +753,6 @@ describe('Pipelines', () => {
               expect(vm.poll.stop).toHaveBeenCalled();
 
               setTimeout(() => {
-                expect(vm.getPipelines).toHaveBeenCalled();
                 expect(vm.poll.restart).toHaveBeenCalled();
                 done();
               }, 0);
@@ -765,10 +763,9 @@ describe('Pipelines', () => {
     });
 
     describe('when no request is being made', () => {
-      it('stops polling, fetches pipelines & restarts polling', done => {
+      it('stops polling & restarts polling', done => {
         spyOn(vm.poll, 'stop');
         spyOn(vm.poll, 'restart');
-        spyOn(vm, 'getPipelines').and.returnValue(Promise.resolve());
 
         setTimeout(() => {
           vm.$el.querySelector('.js-builds-dropdown-button').click();
@@ -776,7 +773,6 @@ describe('Pipelines', () => {
           expect(vm.poll.stop).toHaveBeenCalled();
 
           setTimeout(() => {
-            expect(vm.getPipelines).toHaveBeenCalled();
             expect(vm.poll.restart).toHaveBeenCalled();
             done();
           }, 0);