summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-12-13 19:58:26 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-12-13 20:07:55 +0800
commit07d69d8a6763984536a590690bb58527f6175bc1 (patch)
tree292e4d89f95df29869e28d52361197e3d52bfe5f /app
parent0b451ffc730f1a303f6bf86b7b54e33720217b76 (diff)
downloadgitlab-ce-07d69d8a6763984536a590690bb58527f6175bc1.tar.gz
Fix Slack pipeline message by APIfix-slack-pipeline-message-by-api
Pipelines triggered from API don't have a corresponding user, so we show that it's from API, same as from the web UI Closes #25609
Diffstat (limited to 'app')
-rw-r--r--app/models/project_services/slack_service/pipeline_message.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/slack_service/pipeline_message.rb b/app/models/project_services/slack_service/pipeline_message.rb
index f8d03c0e2fa..b6355fc4171 100644
--- a/app/models/project_services/slack_service/pipeline_message.rb
+++ b/app/models/project_services/slack_service/pipeline_message.rb
@@ -13,7 +13,7 @@ class SlackService
@project_name = data[:project][:path_with_namespace]
@project_url = data[:project][:web_url]
- @user_name = data[:user] && data[:user][:name]
+ @user_name = (data[:user] && data[:user][:name]) || 'API'
end
def pretext