Merge branch 'alphabetically_sort_tags_on_runner_list' into 'master'

Resolve 'Alphabetically sort tags on runner list'

Closes #27409

See merge request !8922
This commit is contained in:
Rémy Coutable 2017-02-15 17:40:33 +00:00
commit 798e03f0c8
5 changed files with 8 additions and 4 deletions

View File

@ -22,7 +22,7 @@
%td
#{runner.builds.count(:all)}
%td
- runner.tag_list.each do |tag|
- runner.tag_list.sort.each do |tag|
%span.label.label-primary
= tag
%td

View File

@ -32,7 +32,7 @@
= label_tag :tag_list, class: 'control-label' do
Tags
.col-sm-10
= f.text_field :tag_list, value: runner.tag_list.to_s, class: 'form-control'
= f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control'
.help-block You can setup jobs to only use Runners with specific tags
.form-actions
= f.submit 'Save changes', class: 'btn btn-save'

View File

@ -31,6 +31,6 @@
= runner.description
- if runner.tag_list.present?
%p
- runner.tag_list.each do |tag|
- runner.tag_list.sort.each do |tag|
%span.label.label-primary
= tag

View File

@ -28,7 +28,7 @@
%tr
%td Tags
%td
- @runner.tag_list.each do |tag|
- @runner.tag_list.sort.each do |tag|
%span.label.label-primary
= tag
%tr

View File

@ -0,0 +1,4 @@
---
title: Alphabetically sort tags on runner list
merge_request: 8922
author: blackst0ne