Merge branch 'master' of github.com:gitlabhq/gitlabhq

Marin Jankovski
2 parents 2e94f0d2 1fca26c9
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
app/models/project_services/slack_service.rb
@@ -52,6 +52,7 @@ class SlackService &lt; Service
     notifier = Slack::Notifier.new(subdomain, token)
     notifier.channel = room
+    notifier.username = 'GitLab'
     notifier.ping(message.compose)
   end
	@@ -52,6 +52,7 @@ class SlackService < Service		@@ -52,6 +52,7 @@ class SlackService < Service
52		52
53	notifier = Slack::Notifier.new(subdomain, token)	53	notifier = Slack::Notifier.new(subdomain, token)
54	notifier.channel = room	54	notifier.channel = room
		55	+ notifier.username = 'GitLab'
55	notifier.ping(message.compose)	56	notifier.ping(message.compose)
56	end	57	end
57		58