Commit Graph

8 Commits

Author SHA1 Message Date
GitLab Bot 968e01a6dd Add latest changes from gitlab-org/gitlab@master 2020-08-14 00:10:28 +00:00
GitLab Bot dcdc526104 Add latest changes from gitlab-org/gitlab@master 2020-07-08 00:09:06 +00:00
GitLab Bot f35a7a3b8e Add latest changes from gitlab-org/gitlab@master 2020-05-07 15:09:29 +00:00
GitLab Bot 99ddca0d88 Add latest changes from gitlab-org/gitlab@master 2019-12-06 21:07:54 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
Nathan Friend eade5c067d
Fix merge button dropdown (CE)
This commit fixes an issue that was causing the merge button dropdown
trigger to be shown even if the dropdown itself was hidden. This commit
also fixes an issue that caused the "Merge Immediately" option not to be
available when merge trains were enabled.
2019-08-12 12:31:47 -04:00
Nathan Friend 35ae9d8a74
Add merge train support to MR merge button (CE)
This commit updates the merge request widget's "Merge" button to
support merge trains.
2019-06-11 09:27:51 -05:00
Natalia Tepluhina 3153c55091 Move EE differences for `ready_to_merge.vue` 2019-04-24 14:09:04 +00:00