diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 15:07:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 15:07:34 +0000 |
| commit | 8b61452138ecc511b52cd49be4ee6b8a80390c50 (patch) | |
| tree | 122b817432c2a0f0e23767bd95791a89b20540c0 /app/models/project_services | |
| parent | f864f8a7aafa45b0e4c04e4312f89da4b1227c0f (diff) | |
| download | gitlab-ce-8b61452138ecc511b52cd49be4ee6b8a80390c50.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_services')
| -rw-r--r-- | app/models/project_services/chat_message/wiki_page_message.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/chat_message/wiki_page_message.rb b/app/models/project_services/chat_message/wiki_page_message.rb index b605d289278..ebe7abb379f 100644 --- a/app/models/project_services/chat_message/wiki_page_message.rb +++ b/app/models/project_services/chat_message/wiki_page_message.rb @@ -14,7 +14,7 @@ module ChatMessage obj_attr = HashWithIndifferentAccess.new(obj_attr) @title = obj_attr[:title] @wiki_page_url = obj_attr[:url] - @description = obj_attr[:content] + @description = obj_attr[:message] @action = case obj_attr[:action] |