diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 18:08:06 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 18:08:06 +0300 |
| commit | 6eeb69fc9a216bd1874cba85214af5b1da1a46d0 (patch) | |
| tree | 5def37365fe1296362791c709f48fc501a67a9cf /app/views | |
| parent | 7d6a0a215806cbcbd7e1918ad042d554e3b6459f (diff) | |
| parent | 27a75ea1757d1c1b67bf501ec333221ed5e92d04 (diff) | |
Merge branch 'jprovazn-rebase' into 'master'
Backport 'Rebase' feature from EE to CE
Closes #40301
See merge request gitlab-org/gitlab-ce!16071
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_merge_request_fast_forward_settings.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_merge_request_rebase_settings.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/_merge_request_fast_forward_settings.html.haml b/app/views/projects/_merge_request_fast_forward_settings.html.haml index 9d357293a2f..8129c72feb2 100644 --- a/app/views/projects/_merge_request_fast_forward_settings.html.haml +++ b/app/views/projects/_merge_request_fast_forward_settings.html.haml @@ -10,4 +10,4 @@ No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. %br %span.descr - When fast-forward merge is not possible, the user must first rebase locally. + When fast-forward merge is not possible, the user is given the option to rebase. diff --git a/app/views/projects/_merge_request_rebase_settings.html.haml b/app/views/projects/_merge_request_rebase_settings.html.haml index c52e09573a6..54e0b73d24c 100644 --- a/app/views/projects/_merge_request_rebase_settings.html.haml +++ b/app/views/projects/_merge_request_rebase_settings.html.haml @@ -10,4 +10,4 @@ This way you could make sure that if this merge request would build, after merging to target branch it would also build. %br %span.descr - When fast-forward merge is not possible, the user must first rebase locally. + When fast-forward merge is not possible, the user is given the option to rebase. |