Commit 798e03f0 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'alphabetically_sort_tags_on_runner_list' into 'master'

Resolve 'Alphabetically sort tags on runner list'

Closes #27409

See merge request !8922
parents dc6b6660 41ec1afd
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
%td %td
#{runner.builds.count(:all)} #{runner.builds.count(:all)}
%td %td
- runner.tag_list.each do |tag| - runner.tag_list.sort.each do |tag|
%span.label.label-primary %span.label.label-primary
= tag = tag
%td %td
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
= label_tag :tag_list, class: 'control-label' do = label_tag :tag_list, class: 'control-label' do
Tags Tags
.col-sm-10 .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 .help-block You can setup jobs to only use Runners with specific tags
.form-actions .form-actions
= f.submit 'Save changes', class: 'btn btn-save' = f.submit 'Save changes', class: 'btn btn-save'
...@@ -31,6 +31,6 @@ ...@@ -31,6 +31,6 @@
= runner.description = runner.description
- if runner.tag_list.present? - if runner.tag_list.present?
%p %p
- runner.tag_list.each do |tag| - runner.tag_list.sort.each do |tag|
%span.label.label-primary %span.label.label-primary
= tag = tag
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
%tr %tr
%td Tags %td Tags
%td %td
- @runner.tag_list.each do |tag| - @runner.tag_list.sort.each do |tag|
%span.label.label-primary %span.label.label-primary
= tag = tag
%tr %tr
......
---
title: Alphabetically sort tags on runner list
merge_request: 8922
author: blackst0ne
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