diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-15 02:46:55 +0000 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-15 02:46:55 +0000 |
commit | 2f35ba98fae6e0b58b196e3fbbe00e6ee703cbe8 (patch) | |
tree | b67a98e00b59bd1a785ffb3fdccf0336c6c92d7d /app/models/project_services/chat_message/wiki_page_message.rb | |
parent | e22bd9650d7bebfea0909fdaf5be7dcf746b53f7 (diff) | |
parent | 309bab431075eabfb7a01300f946ce9eb5b6fb98 (diff) | |
download | gitlab-ce-2f35ba98fae6e0b58b196e3fbbe00e6ee703cbe8.tar.gz |
Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts:
# app/views/layouts/_head.html.haml
# config/webpack.config.js
Diffstat (limited to 'app/models/project_services/chat_message/wiki_page_message.rb')
-rw-r--r-- | app/models/project_services/chat_message/wiki_page_message.rb | 18 |
1 files changed, 12 insertions, 6 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 134083e4504..a139a8ee727 100644 --- a/app/models/project_services/chat_message/wiki_page_message.rb +++ b/app/models/project_services/chat_message/wiki_page_message.rb @@ -1,17 +1,12 @@ module ChatMessage class WikiPageMessage < BaseMessage - attr_reader :user_name attr_reader :title - attr_reader :project_name - attr_reader :project_url attr_reader :wiki_page_url attr_reader :action attr_reader :description def initialize(params) - @user_name = params[:user][:username] - @project_name = params[:project_name] - @project_url = params[:project_url] + super obj_attr = params[:object_attributes] obj_attr = HashWithIndifferentAccess.new(obj_attr) @@ -29,9 +24,20 @@ module ChatMessage end def attachments + return description if markdown + description_message end + def activity + { + title: "#{user_name} #{action} #{wiki_page_link}", + subtitle: "in #{project_link}", + text: title, + image: user_avatar + } + end + private def message |