Add Merge Request button to branches page.
This commit is contained in:
parent
722e393589
commit
164d474488
2 changed files with 8 additions and 5 deletions
|
@ -49,7 +49,7 @@ v 7.11.0 (unreleased)
|
|||
- Add footnotes support to Markdown (Guillaume Delbergue)
|
||||
- Add current_sign_in_at to UserFull REST api.
|
||||
- Make Sidekiq MemoryKiller shutdown signal configurable
|
||||
- Add "Create Merge Request" buttons to commits page and push event.
|
||||
- Add "Create Merge Request" buttons to commits and branches pages and push event.
|
||||
|
||||
v 7.10.2
|
||||
- Fix CI links on MR page
|
||||
|
|
|
@ -10,16 +10,19 @@
|
|||
%i.fa.fa-lock
|
||||
protected
|
||||
.pull-right
|
||||
- if can?(current_user, :download_code, @project)
|
||||
= render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'btn-grouped btn-group-xs'
|
||||
- if create_mr_button?(@repository.root_ref, branch.name)
|
||||
= link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-grouped btn-xs' do
|
||||
= icon('plus')
|
||||
Merge Request
|
||||
|
||||
- if branch.name != @repository.root_ref
|
||||
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-xs', method: :post, title: "Compare" do
|
||||
%i.fa.fa-files-o
|
||||
= icon("exchange")
|
||||
Compare
|
||||
|
||||
- if can_remove_branch?(@project, branch.name)
|
||||
= link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-xs btn-remove remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
|
||||
%i.fa.fa-trash-o
|
||||
= icon("trash-o")
|
||||
|
||||
- if commit
|
||||
%ul.list-unstyled
|
||||
|
|
Loading…
Reference in a new issue