diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-15 17:40:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-15 17:40:33 +0000 |
| commit | 798e03f0c800250c433276e84ca528ea88ad9a16 (patch) | |
| tree | 16bc563012e0d497cd92c750ee861a42a65e930b | |
| parent | dc6b6660259b3737dcac4c8cdcded2e340a4903a (diff) | |
| parent | 41ec1afd01bebd35304c0514d8dd017097410367 (diff) | |
| download | gitlab-ce-798e03f0c800250c433276e84ca528ea88ad9a16.tar.gz | |
Merge branch 'alphabetically_sort_tags_on_runner_list' into 'master'
Resolve 'Alphabetically sort tags on runner list'
Closes #27409
See merge request !8922
| -rw-r--r-- | app/views/admin/runners/_runner.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/_runner.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/alphabetically_sort_tags_on_runner_list.yml | 4 |
5 files changed, 8 insertions, 4 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index 975bd950ae1..deb62845e1c 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -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 diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml index 98e72f6c547..2ef1f98ba48 100644 --- a/app/views/projects/runners/_form.html.haml +++ b/app/views/projects/runners/_form.html.haml @@ -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' diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index 7036b8a5ccc..deeadb609f6 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -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 diff --git a/app/views/projects/runners/show.html.haml b/app/views/projects/runners/show.html.haml index 61b99f35d74..49415ba557b 100644 --- a/app/views/projects/runners/show.html.haml +++ b/app/views/projects/runners/show.html.haml @@ -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 diff --git a/changelogs/unreleased/alphabetically_sort_tags_on_runner_list.yml b/changelogs/unreleased/alphabetically_sort_tags_on_runner_list.yml new file mode 100644 index 00000000000..ffcf197a596 --- /dev/null +++ b/changelogs/unreleased/alphabetically_sort_tags_on_runner_list.yml @@ -0,0 +1,4 @@ +--- +title: Alphabetically sort tags on runner list +merge_request: 8922 +author: blackst0ne |