allow using the user's email address as a http parameter in gravatar urls for custom avatar systems. For example:
plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size}"
add mentions of the different placeholders possible for gravatar urls, mentionning the new %{email}
allow using the user's email address as a http parameter in gravatar urls for custom avatar systems. For example:
plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size}"

add mention of the different placeholders possible for gravatar urls, mentionning the new %{email}
Merge branch 'email_in_gravatar_urls' of gitlab.com:arnaud/gitlab-ce into email_in_gravatar_urls
Give the Rails cache its own Redis namespace

Before this change, Rails cache data was stored in a global Redis
namespace. As a consequence, clearing the Rails cache (`rake
cache:clear`) would also delete all Sidekiq queue data and session
storage. This change puts all Rails cache data in a `cache:gitlab`
namespace, making `rake cache:clear` safe again.
Add db index for active user display.
Don't update the changelog since the feature landed in 6.8.
Add schema number change.
Add markdown styleguide.
Actually use the 'user_filter' configuration option
Newline between sentence and code block
Merge branch 'missing-part-of-active-user' into 'master'

Missing part of active user
Merge branch 'namespace_redis_cache' into 'master'

Give the Rails cache its own Redis namespace
Merge pull request #6795 from cirosantilli/markdown-styleguide

Add markdown styleguide.
 Merge branch 'render_docs' into 'master'

Fix code block that doesn't render correctly in doc.gitlab.com

Probably fixes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/6
 Merge branch 'bug-to-ldap-configuration' into 'master'

LDAP Configuration Fix

This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/180 in new installations of version 6.8 (installations upgraded from 6.7 still have the issue, however).
 Merge branch 'email_in_gravatar_urls' into 'master'

allow passing user's email address in custom Gravatar urls

Some custom avatar systems use the user's email address rather than its hash. This merge request will allow the administrator to configure gitlab-ce to use the user's email address gravatar.plain_url and  gravatar.ssl_url in the config file like this:

```
gravatar:
    enabled: true
    plain_url: "http://company.com/avatar/?mail=%{email}&size=%{size}"
    ssl_url: "https://company.com/avatar/?mail=%{email}&size=%{size}"
```

It's a only a 2 word patch.
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
Bump the required gitlab-shell version to 1.9.3
Merge branch 'bump_gitlab_shell' into 'master'

Bump gitlab shell