Merge pull request #6440 from tomislacker/patch-1

Update user_management.md
Add gzip compression for assets to nginx example.
Merge branch 'master' of github.com:gitlabhq/gitlabhq
 Merge branch 'enable_assets_compression' into 'master'

Add gzip compression for assets to nginx example
Fix the merge notification email not being sent

The 'author_id_of_changes' attribute is not persisted in the database.
As we retrieve the merge request from the DB just before sending the
email, this attribute was always nil.

Also there was no tests for the merge notification code - tests have
been added.

Fix #6605
Applications js to coffee

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Use humanize instead of titleize for MR title suggestion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
We should only specify unsafe version, never give advise since it it perishable.
 Merge branch 'advise-in-upgrade-guide-is-outdated' into 'master'

Advise In Upgrade Guide Is Outdated
 Merge branch 'attribution-for-shell-guide' into 'master'

Attribution For Shell Guide
 Merge branch 'improve-mr-form' into 'master'

Remove assignee/milestone selects from MR form

Fixes #1079 and http://feedback.gitlab.com/forums/176466-general/suggestions/5663897-merge-request-assign-to-should-popule-with-membe
Prevent discussion about is it a bug or a feature request.
 Merge branch 'application-js-coffee' into 'master'

Applications js to coffee
 Merge branch 'no-emails-for-mentions' into 'master'

 Don't send an email for "mentioned in" notes

Currently, an email is sent every time a mentionable is referenced by an issue, a commit or a merge request: if I comment "This MR is related to #5", the watchers get one email for the comment, and another one stating "Issue #5 was mentioned by issue #13".

This is annoying — but the biggest issue is when pushing an existing branch. Every issue referenced by commit messages in this branch will get a new mention (which is fine), and dozens of emails will be sent for all these new mentions (which is not).

This commit fixes the spam by avoiding to send an email when a new mention is added to an existing mentionable. In most cases the email notification sent by the mentioner is enough.
Initial implementation
Merge pull request #6606 from kemenaran/fix-merge-notifications

Fix the merge notification email not being sent
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
 Merge branch 'no-verify-for-webhooks' into 'master'

Inform people about the verify-none for webhooks.

Fixes #980
 Merge branch 'external-issue-tracker-instructions' into 'master'

External Issue Tracker Instructions
 Merge branch 'sidekiq_load_check' into 'master'

Sidekiq Load Check