BigW Consortium Gitlab

Commit 18b445ad by James Edwards-Jones

Protected tags can be added/listed via UI

parent f51eac1d
...@@ -53,9 +53,9 @@ class ProtectedTagDropdown { ...@@ -53,9 +53,9 @@ class ProtectedTagDropdown {
getProtectedTags(term, callback) { getProtectedTags(term, callback) {
if (this.selectedTag) { if (this.selectedTag) {
callback(gon.open_branches.concat(this.selectedTag)); callback(gon.open_tags.concat(this.selectedTag));
} else { } else {
callback(gon.open_branches); callback(gon.open_tags);
} }
} }
......
= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch], html: { class: 'new_protected_tag' } do |f| = form_for [@project.namespace.becomes(Namespace), @project, @protected_tag], html: { class: 'new_protected_tag' } do |f|
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
%h3.panel-title %h3.panel-title
Protect a tag Protect a tag
.panel-body .panel-body
.form-horizontal .form-horizontal
= form_errors(@protected_branch) = form_errors(@protected_tag)
.form-group .form-group
= f.label :name, class: 'col-md-2 text-right' do = f.label :name, class: 'col-md-2 text-right' do
Tag: Tag:
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%h4.prepend-top-0 %h4.prepend-top-0
Protected tags Protected tags
%p.prepend-top-20 %p.prepend-top-20
By default, Protected branches are designed to: By default, Protected tags are designed to:
%ul %ul
%li Prevent tag pushes from everybody except Masters %li Prevent tag pushes from everybody except Masters
%li Prevent <strong>anyone</strong> from force pushing to the tag %li Prevent <strong>anyone</strong> from force pushing to the tag
......
%tr.js-protected-tag-edit-form{ data: { url: namespace_project_protected_tag_path(@project.namespace, @project, protected_tag) } }
%td
= protected_tag.name
- if @project.root_ref?(protected_tag.name)
%span.label.label-info.prepend-left-5 default
%td
- if protected_tag.wildcard?
- matching_tags = protected_tag.matching(repository.tags)
= link_to pluralize(matching_tags.count, "matching tag"), namespace_project_protected_tag_path(@project.namespace, @project, protected_tag)
- else
- if commit = protected_tag.commit
= link_to(commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit.id), class: 'commit_short_id')
= time_ago_with_tooltip(commit.committed_date)
- else
(tag was removed from repository)
= render partial: 'projects/protected_tags/update_protected_tag', locals: { protected_tag: protected_tag }
- if can_admin_project
%td
= link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_tag], data: { confirm: 'tag will be writable for developers. Are you sure?' }, method: :delete, class: 'btn btn-warning'
.panel.panel-default.protected-tags-list .panel.panel-default.protected-tags-list
- if @protected_tags.empty?
.panel-heading .panel-heading
%h3.panel-title %h3.panel-title
Protected tag (0) Protected tag (#{@protected_tags.size})
%p.settings-message.text-center %p.settings-message.text-center
There are currently no protected tags, protect a tag with the form above. There are currently no protected tags, protect a tag with the form above.
- else
- can_admin_project = can?(current_user, :admin_project, @project)
%table.table.table-bordered
%colgroup
%col{ width: "25%" }
%col{ width: "55%" }
%col{ width: "20%" }
%thead
%tr
%th Protected tag (#{@protected_tags.size})
%th Last commit
%th Allowed to push
- if can_admin_project
%th
%tbody
= render partial: 'projects/protected_tags/protected_tag', collection: @protected_tags, locals: { can_admin_project: can_admin_project}
= paginate @protected_tags, theme: 'gitlab'
%td
= hidden_field_tag "allowed_to_push_#{protected_tag.id}", protected_tag.push_access_levels.first.access_level
/ = dropdown_tag( (protected_tag.push_access_levels.first.humanize || 'Select') ,
/ options: { toggle_class: 'js-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container',
/ data: { field_name: "allowed_to_push_#{protected_tag.id}", access_level_id: protected_tag.push_access_levels.first.id }})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment