diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2015-03-19 09:36:07 -0400 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2015-07-20 11:23:27 -0400 |
| commit | 374b95c38e2b178d0a0b006c41ed12cd272bdb9f (patch) | |
| tree | 83d11bf9ea2c7e4f7e2691d3b5e778f05be4bb9e | |
| parent | da039ed51c5e8755cfdc1045ecfbb5b238e8231b (diff) | |
| download | gitlab-ce-374b95c38e2b178d0a0b006c41ed12cd272bdb9f.tar.gz | |
merge_requests: add fetch command to the MR page
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0db3dfc04a5..881b2705274 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ v 7.14.0 (unreleased) - Set OmniAuth full_host parameter to ensure redirect URIs are correct (Stan Hu) - Expire Rails cache entries after two weeks to prevent endless Redis growth - Add support for destroying project milestones (Stan Hu) + - Add fetch command to the MR page. v 7.13.0 (unreleased) - Only enable HSTS header for HTTPS and port 443 (Stan Hu) diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index b6d9b135c70..faaa85896cf 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -31,6 +31,16 @@ %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch) %li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff) + - if @merge_request.open? and @merge_request.source_branch_exists? + .append-bottom-20 + .slead + %span + Fetch the branch with + %strong.label-branch< + git fetch + \ #{@merge_request.source_project.http_url_to_repo} + \ #{@merge_request.source_branch} + = render "projects/merge_requests/show/how_to_merge" = render "projects/merge_requests/widget/show.html.haml" |