Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-11-12 17:57:38 +0300
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-11-12 17:57:38 +0300
commit6adc313a1f48809543c626aa226ad56979cdde99 (patch)
tree94f860b06b60a8a12e95bc36f292bff30b0fa912 /doc
parent3bd12e992b40e1016e3431c58b8d6523219c78c3 (diff)
parent857852ce048607a0898a9b40e04fdb0658b6a83d (diff)
Merge branch 'actions_in_the_inbox' into 'master'
Actions in the inbox Related to #1607 See merge request !1247
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/gitlab_actions.pngbin0 -> 17321 bytes
-rw-r--r--doc/integration/gitlab_buttons_in_gmail.md11
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/integration/gitlab_actions.png b/doc/integration/gitlab_actions.png
new file mode 100644
index 00000000000..b08f54d137b
--- /dev/null
+++ b/doc/integration/gitlab_actions.png
Binary files differ
diff --git a/doc/integration/gitlab_buttons_in_gmail.md b/doc/integration/gitlab_buttons_in_gmail.md
new file mode 100644
index 00000000000..5cfea5a90f8
--- /dev/null
+++ b/doc/integration/gitlab_buttons_in_gmail.md
@@ -0,0 +1,11 @@
+# GitLab buttons in gmail
+
+GitLab supports [Google actions in email](https://developers.google.com/gmail/markup/actions/actions-overview).
+
+If correctly setup, emails that require an action will be marked in Gmail.
+
+![gitlab_actions](gitlab_actions.png)
+
+To get this functioning, you need to be registered with Google.
+[See how to register with google in this document.](https://developers.google.com/gmail/markup/registering-with-google)
+