summaryrefslogtreecommitdiff
path: root/doc/customization
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-26 16:48:26 +0000
committerRémy Coutable <remy@rymai.me>2016-04-26 16:48:26 +0000
commit7f3a8e189908a10678c932141215f6977dd3596b (patch)
treed5b492f09e77e9e4db385e1bf593d1cd2d6e3bb7 /doc/customization
parentb65c4abd7409e681682e18acf070718af11a0851 (diff)
parentea19bd6d9c26e3be5ba924504dc638569a034b98 (diff)
downloadgitlab-ce-7f3a8e189908a10678c932141215f6977dd3596b.tar.gz
Merge branch 'patch-1' into 'master'
Add usage example for the Office 365 GetPersonaPhoto-service. See merge request !2462
Diffstat (limited to 'doc/customization')
-rw-r--r--doc/customization/libravatar.md13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/customization/libravatar.md b/doc/customization/libravatar.md
index bd2c242afc2..c46ce2ee203 100644
--- a/doc/customization/libravatar.md
+++ b/doc/customization/libravatar.md
@@ -67,3 +67,16 @@ Run `sudo gitlab-ctl reconfigure` for changes to take effect.
In order to use a different set other than `identicon`, replace `&d=identicon` portion of the URL with another supported set.
For example, you can use `retro` set in which case the URL would look like: `plain_url: "http://cdn.libravatar.org/avatar/%{hash}?s=%{size}&d=retro"`
+
+
+## Usage examples
+
+#### For Microsoft Office 365
+
+If your users are Office 365-users, the "GetPersonaPhoto" service can be used. Note that this service requires login, so this use case is
+most useful in a corporate installation, where all users have access to Office 365.
+
+```ruby
+gitlab_rails['gravatar_plain_url'] = 'http://outlook.office365.com/owa/service.svc/s/GetPersonaPhoto?email=%{email}&size=HR120x120'
+gitlab_rails['gravatar_ssl_url'] = 'https://outlook.office365.com/owa/service.svc/s/GetPersonaPhoto?email=%{email}&size=HR120x120'
+```