Commit Graph

7 Commits

Author SHA1 Message Date
GitLab Bot 2f47b6d8e1 Add latest changes from gitlab-org/gitlab@master 2020-06-26 09:08:59 +00:00
GitLab Bot b3e4ec8e8a Add latest changes from gitlab-org/gitlab@master 2019-10-23 09:06:03 +00:00
Thong Kuah d6b952ad3e
Add frozen_string_literal to spec/workers
Adds `# frozen_string_literal: true` to spec/workers ruby files
2019-04-01 13:35:22 -03:00
Oswaldo Ferreira cafc543ce8 Adjust flaky Rails logger call test 2018-12-18 16:48:59 -02:00
Felipe Artur 504f77b43a Prevent worker that updates merge requests head pipeline from failing jobs 2017-12-13 13:36:52 -02:00
Oswaldo Ferreira a6c52c4e59 Make merge_jid handling less stateful in MergeService 2017-10-27 22:33:48 +02:00
Oswaldo Ferreira 0640b3d1d8 Store MergeWorker JID on merge request, and clean up stuck merges 2017-08-07 15:23:37 -03:00