Commit Graph

15 Commits

Author SHA1 Message Date
GitLab Bot 58f5efa917 Add latest changes from gitlab-org/gitlab@master 2022-04-01 00:08:25 +00:00
GitLab Bot 80e6e0fcdd Add latest changes from gitlab-org/gitlab@master 2022-02-25 03:16:18 +00:00
GitLab Bot 4dc620034e Add latest changes from gitlab-org/gitlab@master 2022-01-13 00:16:12 +00:00
GitLab Bot 19a051ca1e Add latest changes from gitlab-org/gitlab@master 2022-01-05 18:13:30 +00:00
GitLab Bot efcaec8a14 Add latest changes from gitlab-org/gitlab@master 2021-11-09 18:13:13 +00:00
GitLab Bot e9322e019b Add latest changes from gitlab-org/gitlab@master 2021-08-24 18:10:53 +00:00
GitLab Bot 0179dc40d7 Add latest changes from gitlab-org/gitlab@master 2021-03-08 18:09:12 +00:00
GitLab Bot 16cfd85bcf Add latest changes from gitlab-org/gitlab@master 2021-02-09 18:09:59 +00:00
GitLab Bot f8bb64721a Add latest changes from gitlab-org/gitlab@master 2020-11-26 06:09:20 +00:00
GitLab Bot 05480e90f3 Add latest changes from gitlab-org/gitlab@master 2020-07-28 18:09:36 +00:00
Ben Bodenmiller cc5f51970a Improve details about when rebase button is offered 2019-08-21 06:16:17 +00:00
Achilleas Pipinellis fb9f1e92ed Single source of truth for merge requests
- Edit pages under user/project/merge_requests and
  add the relevant types in the frontmatter.
- Clean up descriptions.

Based on https://gitlab.com/groups/gitlab-org/-/epics/1280
2019-06-09 22:25:13 +00:00
Jan Provaznik 27a75ea175 Backport 'Rebase' feature from EE to CE
When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.

This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)

Closes #40301
2018-01-05 09:34:59 +01:00
Eric Eastwood 8e7b881556 Update fast-forward mr widget docs and add images 2017-09-19 23:48:40 -05:00
Valery Sizov 9cc8c631ba Add documentation for MR's fast-forward merge method 2017-09-19 23:48:40 -05:00