summaryrefslogtreecommitdiff
path: root/app/models/project_services/slack_service/note_message.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-04 08:17:05 +0100
committerPhil Hughes <me@iamphill.com>2016-10-04 08:17:05 +0100
commit88857a2c3b0b841c7db8cc5a9dfd0d40b5665cef (patch)
treef596412ba7e75c9ce6baccbbfd7795ed3a725097 /app/models/project_services/slack_service/note_message.rb
parent735731a565e593fa8df445b3bb2ac2f768fb1fae (diff)
parent4be63f5b5bd9c0859f5ba2b91ecdbdcc57b69b98 (diff)
downloadgitlab-ce-88857a2c3b0b841c7db8cc5a9dfd0d40b5665cef.tar.gz
Merge branch 'master' into revert-c676283b
Diffstat (limited to 'app/models/project_services/slack_service/note_message.rb')
-rw-r--r--app/models/project_services/slack_service/note_message.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/slack_service/note_message.rb b/app/models/project_services/slack_service/note_message.rb
index 89ba51cb662..9e84e90f38c 100644
--- a/app/models/project_services/slack_service/note_message.rb
+++ b/app/models/project_services/slack_service/note_message.rb
@@ -10,7 +10,7 @@ class SlackService
def initialize(params)
params = HashWithIndifferentAccess.new(params)
- @user_name = params[:user][:name]
+ @user_name = params[:user][:username]
@project_name = params[:project_name]
@project_url = params[:project_url]