summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-07 09:38:39 +0000
committerPhil Hughes <me@iamphill.com>2019-03-07 09:38:39 +0000
commit78a01253aa112de6b2c3feb6784c80982c3b3add (patch)
treec989d9828e1ca3dd77b861eed0bc8834f1761636 /app
parent57b5413893490ad6f3ef93a635f052ee3c50dcc6 (diff)
parentfcd2358530ae67a50b506d864891febfff93810a (diff)
downloadgitlab-ce-78a01253aa112de6b2c3feb6784c80982c3b3add.tar.gz
Merge branch '52459-display-job-names-consistently-on-pipelines-and-environments-list' into 'master'
Resolve "Display job names consistently in pipelines and environments" Closes #52459 See merge request gitlab-org/gitlab-ce!24984
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/environments/components/environment_item.vue3
-rw-r--r--app/views/projects/deployments/_actions.haml2
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue
index eb817beab9d..1e89dce69cb 100644
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -3,7 +3,6 @@ import Timeago from 'timeago.js';
import _ from 'underscore';
import { GlTooltipDirective } from '@gitlab/ui';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
-import { humanize } from '~/lib/utils/text_utility';
import Icon from '~/vue_shared/components/icon.vue';
import ActionsComponent from './environment_actions.vue';
import ExternalUrlComponent from './environment_external_url.vue';
@@ -156,7 +155,7 @@ export default {
const combinedActions = (manualActions || []).concat(scheduledActions || []);
return combinedActions.map(action => ({
...action,
- name: humanize(action.name),
+ name: action.name,
}));
},
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml
index f4c91377ecb..e45c5be76de 100644
--- a/app/views/projects/deployments/_actions.haml
+++ b/app/views/projects/deployments/_actions.haml
@@ -11,4 +11,4 @@
- next unless can?(current_user, :update_build, action)
%li
= link_to [:play, @project.namespace.becomes(Namespace), @project, action], method: :post, rel: 'nofollow', class: 'btn' do
- %span= action.name.humanize
+ %span= action.name