diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-01-16 17:00:21 +0000 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-01-16 17:00:21 +0000 |
commit | 3e0136642f8c7cb8d9cf1a8261de11ec5d06994c (patch) | |
tree | 517ae73d2120fcee2ddfe0354cb6e9ddf9b4b452 /app | |
parent | 0ff88ac56281db18afa37981530d97da0ea8e38a (diff) | |
parent | 3f2eaaa26b68a61c506f847c8f56d7411058da7f (diff) | |
download | gitlab-ce-3e0136642f8c7cb8d9cf1a8261de11ec5d06994c.tar.gz |
Merge branch '25946-manual-pipeline-dropdown-casing' into 'master'
Retain original casing for build name in manual pipeline dropdown
Closes #25946
See merge request !8387
Diffstat (limited to 'app')
-rw-r--r-- | app/serializers/build_action_entity.rb | 2 | ||||
-rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/build_action_entity.rb b/app/serializers/build_action_entity.rb index 3e72892d584..184f5fd4b52 100644 --- a/app/serializers/build_action_entity.rb +++ b/app/serializers/build_action_entity.rb @@ -2,7 +2,7 @@ class BuildActionEntity < Grape::Entity include RequestAwareEntity expose :name do |build| - build.name.humanize + build.name end expose :path do |build| diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 6ce586cc8f6..990bfbcf951 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -86,7 +86,7 @@ %li = link_to play_namespace_project_build_path(pipeline.project.namespace, pipeline.project, build), method: :post, rel: 'nofollow' do = custom_icon('icon_play') - %span= build.name.humanize + %span= build.name - if artifacts.present? .btn-group %button.dropdown-toggle.btn.btn-default.build-artifacts.js-pipeline-dropdown-download{ type: 'button', 'data-toggle' => 'dropdown' } |