Merge branch 'mr-merge-manually-2' into 'master'
Move merge manually text below merge widget Replace !1121 Screenshot: #### Before ![Screenshot_2015-08-10_18.25.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ac7df8dd03104b3b44c61b3bff709653/Screenshot_2015-08-10_18.25.22.png) #### After ![Screenshot_2015-08-10_18.28.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c92b8eaeadb842705577dba1f52b67e5/Screenshot_2015-08-10_18.28.30.png) See merge request !1141
This commit is contained in:
commit
6a82c9f018
3 changed files with 9 additions and 13 deletions
|
@ -29,12 +29,9 @@ v 7.14.0 (unreleased)
|
|||
- Return comments in created order in merge request API (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.
|
||||
- Allow custom backup archive permissions
|
||||
- Add fetch command to the MR page
|
||||
- Add project star and fork count, group avatar URL and user/group web URL attributes to API
|
||||
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
|
||||
- Add fetch command to the MR page.
|
||||
- Show who last edited a comment if it wasn't the original author
|
||||
- Send notification to all participants when MR is merged.
|
||||
- Add ability to manage user email addresses via the API.
|
||||
|
|
|
@ -22,19 +22,19 @@
|
|||
%li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
|
||||
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
|
||||
.light
|
||||
%div
|
||||
%span Request to merge
|
||||
%span.label-branch #{source_branch_with_namespace(@merge_request)}
|
||||
%span into
|
||||
%span.label-branch #{@merge_request.target_branch}
|
||||
- if @merge_request.open? && !@merge_request.branch_missing?
|
||||
%div
|
||||
If you want to try or merge this request manually, you can use the
|
||||
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
|
||||
%span Request to merge
|
||||
%span.label-branch #{source_branch_with_namespace(@merge_request)}
|
||||
%span into
|
||||
%span.label-branch #{@merge_request.target_branch}
|
||||
|
||||
= render "projects/merge_requests/show/how_to_merge"
|
||||
= render "projects/merge_requests/widget/show.html.haml"
|
||||
|
||||
- if @merge_request.open? && @merge_request.can_be_merged?
|
||||
.light
|
||||
You can also accept this merge request manually using the
|
||||
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
|
||||
|
||||
- if @commits.present?
|
||||
%ul.nav.nav-tabs.merge-request-tabs
|
||||
%li.notes-tab
|
||||
|
|
|
@ -23,4 +23,3 @@
|
|||
btn = $('.accept_merge_request')
|
||||
btn.disable()
|
||||
btn.html("<i class='fa fa-spinner fa-spin'></i> Merge in progress")
|
||||
|
||||
|
|
Loading…
Reference in a new issue