Merge branch 'master' into new-resolvable-discussion

# Conflicts:
#	app/assets/javascripts/filtered_search/dropdown_hint.js
#	app/views/shared/issuable/_search_bar.html.haml

1 files changed, 19 insertions, 0 deletions

diff --git a/lib/microsoft_teams/activity.rb b/lib/microsoft_teams/activity.rb
new file mode 100644
index 00000000000..d2c420efdaf
--- /dev/null
+++ b/lib/microsoft_teams/activity.rb
@@ -0,0 +1,19 @@
+module MicrosoftTeams
+  class Activity
+    def initialize(title:, subtitle:, text:, image:)
+      @title = title
+      @subtitle = subtitle
+      @text = text
+      @image = image
+    end
+
+    def prepare
+      {
+        'activityTitle' => @title,
+        'activitySubtitle' => @subtitle,
+        'activityText' => @text,
+        'activityImage' => @image
+      }
+    end
+  end
+end