summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-03-26 11:21:42 +0100
committerMarin Jankovski <marin@gitlab.com>2014-03-26 11:21:42 +0100
commit78a7a9b0be5f4f257ee491a88df7c85fcb2b926b (patch)
tree67573d8338de5e84c522d944a255205133c76e54
parent2e94f0d224b8e994adc2ac7868fa6ec5c5c9264a (diff)
parent1fca26c94c0afb958ecbd87c64927be3fc3c9b30 (diff)
downloadgitlab-ce-78a7a9b0be5f4f257ee491a88df7c85fcb2b926b.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--app/models/project_services/slack_service.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index 754fd87db02..410dda22d47 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -52,6 +52,7 @@ class SlackService < Service
notifier = Slack::Notifier.new(subdomain, token)
notifier.channel = room
+ notifier.username = 'GitLab'
notifier.ping(message.compose)
end