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}"
Only one link per email to prevent clicking the wrong one.
add mentions of the different placeholders possible for gravatar urls, mentionning the new %{email}
Update slack to fix issues with ruby 1.9.3
Update to fix ruby 1.9.3 issue with slack-notifier
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
Add short path route for groups.
Use VersionSorter on the Project > Tags page
Rename issue form tags to match MR and params.
Include SASS in subdirectories with glob.
Merge pull request #6773 from tsigo/rs-tag-page-sorting

Use VersionSorter on the Project > Tags page
Merge pull request #6774 from cirosantilli/issue-form-rename-fields

Rename issue form tags Subject -> Title and Details -> Description
Add monthly active users to the admin dashboard.
Fixes to group route tests, thanks DZ
 Merge branch 'master' into 'master'

Issue 155: Slack-notifier update to fix 500 errors

Slack-notifier 0.2.0 is broken for Rails 1.9.3

This update bumps the Gemfile/Gemfile.lock to use 0.3.2 version of the gem file to correct the issue.

slack-notifier changelog addressing the issue

https://github.com/stevenosloan/slack-notifier/blob/master/changelog.md

Issue 155 about the error

https://gitlab.com/gitlab-org/gitlab-ce/issues/155
Merge branch 'prevent-two-links-in-emails' into 'master'

Prevent-two-links-in-emails

Only one link per email to prevent clicking the wrong one.
Merge branch 'active-users' into 'master'

Active users

Show the number of active users in the dashboard.
Merge branch 'routing-for-groups' into 'master'

Routing for groups

Implements http://feedback.gitlab.com/forums/176466-general/suggestions/5723800-group-url-on-root-path-groups-name-instead-of-g
Endpoints are for RPC interfaces, we have resources.