Merge remote-tracking branch 'origin/master' into issue_3799

3 files changed, 55 insertions, 2 deletions

diff --git a/app/models/project_services/slack_service/merge_message.rb b/app/models/project_services/slack_service/merge_message.rb
index e792c258f73..11fc691022b 100644
--- a/app/models/project_services/slack_service/merge_message.rb
+++ b/app/models/project_services/slack_service/merge_message.rb
@@ -50,7 +50,7 @@ class SlackService
     end
 
     def merge_request_link
-      "[merge request ##{merge_request_id}](#{merge_request_url})"
+      "[merge request !#{merge_request_id}](#{merge_request_url})"
     end
 
     def merge_request_url
diff --git a/app/models/project_services/slack_service/note_message.rb b/app/models/project_services/slack_service/note_message.rb
index b15d9a14677..89ba51cb662 100644
--- a/app/models/project_services/slack_service/note_message.rb
+++ b/app/models/project_services/slack_service/note_message.rb
@@ -58,7 +58,7 @@ class SlackService
 
     def create_merge_note(merge_request)
       commented_on_message(
-        "[merge request ##{merge_request[:iid]}](#{@note_url})",
+        "[merge request !#{merge_request[:iid]}](#{@note_url})",
         format_title(merge_request[:title]))
     end
 
diff --git a/app/models/project_services/slack_service/wiki_page_message.rb b/app/models/project_services/slack_service/wiki_page_message.rb
new file mode 100644
index 00000000000..f336d9e7691
--- /dev/null
+++ b/app/models/project_services/slack_service/wiki_page_message.rb
@@ -0,0 +1,53 @@
+class SlackService
+  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][:name]
+      @project_name = params[:project_name]
+      @project_url = params[:project_url]
+
+      obj_attr = params[:object_attributes]
+      obj_attr = HashWithIndifferentAccess.new(obj_attr)
+      @title = obj_attr[:title]
+      @wiki_page_url = obj_attr[:url]
+      @description = obj_attr[:content]
+
+      @action =
+        case obj_attr[:action]
+        when "create"
+          "created"
+        when "update"
+          "edited"
+        end
+    end
+
+    def attachments
+      description_message
+    end
+
+    private
+
+    def message
+      "#{user_name} #{action} #{wiki_page_link} in #{project_link}: *#{title}*"
+    end
+
+    def description_message
+      [{ text: format(@description), color: attachment_color }]
+    end
+
+    def project_link
+      "[#{project_name}](#{project_url})"
+    end
+
+    def wiki_page_link
+      "[wiki page](#{wiki_page_url})"
+    end
+  end
+end