Merge branch 'inline-protected-branches' into 'master'
Improve UI for protected branches See merge request !1361
This commit is contained in:
commit
da9d827904
|
@ -1,10 +1,12 @@
|
||||||
- unless @branches.empty?
|
- unless @branches.empty?
|
||||||
%h5 Already Protected:
|
%br
|
||||||
|
%h4 Already Protected:
|
||||||
%table.table.protected-branches-list
|
%table.table.protected-branches-list
|
||||||
%thead
|
%thead
|
||||||
%tr.no-border
|
%tr.no-border
|
||||||
%th Branch
|
%th Branch
|
||||||
%th Developers can push
|
%th Developers can push
|
||||||
|
%th Last commit
|
||||||
%th
|
%th
|
||||||
|
|
||||||
%tbody
|
%tbody
|
||||||
|
@ -18,19 +20,15 @@
|
||||||
%span.label.label-info default
|
%span.label.label-info default
|
||||||
%td
|
%td
|
||||||
= check_box_tag "developers_can_push", branch.id, branch.developers_can_push, "data-url" => @url
|
= check_box_tag "developers_can_push", branch.id, branch.developers_can_push, "data-url" => @url
|
||||||
|
%td
|
||||||
|
- if commit = branch.commit
|
||||||
|
= link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
|
||||||
|
= commit.short_id
|
||||||
|
·
|
||||||
|
#{time_ago_with_tooltip(commit.committed_date)}
|
||||||
|
- else
|
||||||
|
(branch was removed from repository)
|
||||||
%td
|
%td
|
||||||
.pull-right
|
.pull-right
|
||||||
- if can? current_user, :admin_project, @project
|
- if can? current_user, :admin_project, @project
|
||||||
= link_to 'Unprotect', [@project, branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-remove btn-small"
|
= link_to 'Unprotect', [@project, branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-remove btn-small"
|
||||||
%tr.no-border
|
|
||||||
%td
|
|
||||||
- if commit = branch.commit
|
|
||||||
= link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
|
|
||||||
= commit.short_id
|
|
||||||
%span.light
|
|
||||||
= gfm escape_once(truncate(commit.title, length: 40))
|
|
||||||
#{time_ago_with_tooltip(commit.committed_date)}
|
|
||||||
- else
|
|
||||||
(branch was removed from repository)
|
|
||||||
%td
|
|
||||||
%td
|
|
||||||
|
|
Loading…
Reference in New Issue