https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6658#note_17190236

* upstream/master: (368 commits)
  Use root_url for issue boards user link
  removes extra line for empty milestone description
  code formatting corrected
  Fix reply-by-email not working due to queue name mismatch
  Remove duplicate code in repository cache clearing
  Expire and build repository cache after project import
  refactor(email): use setter method instead AR callbacks
  Move spec/mailers/shared/notify.rb to spec/support
  Fix status code expectation
  Stop clearing the database cache on rake cache:clear
  Fix error in generating labels
  Fix bug where e-mails were not being sent out via Sidekiq
  Document link syntax introduced by !5586
  Fix documents and comments on Build API `scope`. #23146 #19131
  adds entry in CHANGELOG
  removes extra line for empty issue description
  Re-organize queues to use for Sidekiq
  Fix wrong endpoint in api/users documentation, fix same typo in spec describe blocks
  Update CHANGELOG
  Fix object data to be sent to fetch analytics data
  ...

Use root_url for issue boards user link

## What does this MR do?

Rather than using `/` as the root path, it now correctly sends the root URL from Rails to prevent errors with installations in subdirectories. 

## What are the relevant issue numbers?

Closes #23556

See merge request !7018

This MR removes AR before_validation callback in favor setter.

## Why was this MR needed?

Because setters is good practice to normalize model attributes instead AR callbacks. Because new object should be valid right after initialization. 
If it MR interested I can try to find other places where we can use setters.

See merge request !6763

Moves `spec/mailers/shared/notify.rb` to `spec/support/notify_shared_examples.rb`

Closes #22609 

See merge request !6605

Fix reply-by-email not working due to queue name mismatch

See merge request !7068

Closes #23556

removes extra line for empty description

## What does this MR do?
This MR removes an odd line for empty description 
## Are there points in the code the reviewer needs to double check?
Not necessary
## Why was this MR needed?
Improve UX 
## Screenshots (if relevant)
**Before**
![ss__2016-10-19_at_11.04.45_PM](/uploads/12b376c772115c2e5eef2fe0c0d1992f/ss__2016-10-19_at_11.04.45_PM.png)
**After**
![edi](/uploads/89fea59ef5267974af4cbe1064dc521a/edi.png)
## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #23557 #23695

See merge request !7045

Document link syntax introduced by !5586.

See merge request !7049

* master: (22 commits)
  Fix status code expectation
  Stop clearing the database cache on rake cache:clear
  Fix error in generating labels
  Fix bug where e-mails were not being sent out via Sidekiq
  Fix documents and comments on Build API `scope`. #23146 #19131
  Re-organize queues to use for Sidekiq
  Fix wrong endpoint in api/users documentation, fix same typo in spec describe blocks
  Update CHANGELOG
  Fix object data to be sent to fetch analytics data
  Fixed compare ellipsis messing with layout
  Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".
  fix font weight of project feature settings
  Add hover to trash icon in notes
  Ensure custom provider tab labels don't break layout.
  Fixed issue when images are loading it would push off the tabs
  Fixed issues with sticky mr tabs & sidebar
  Refactor and add new functionality to CI yaml reference
  Ignore external issues when bulk assigning issues to author of merge request.
  Changed gitlab-shell version to avoid warning when precompiling the assets.
  Grammar fixes in docs
  ...

mail_room was configured to deliver mail to the `incoming_email`
queue while `EmailReceiveWorker` was reading the `email_receiver`
queue. Adds a migration that repeats the work of a previous
migration to ensure all mails that wound up in the old
queue get processed.

Closes #23689

After a project import, there's a chance that the UI checks the
branch count before the project has been imported. This change
causes more of the keys to be flushed after an import and forces
a rebuild of the repository cache.

Closes #13518

Fix error in generating labels

Attempting to generate default set of labels would result in
an error:

ArgumentError: wrong number of arguments (given 1, expected 0)

Closes #23649

See merge request !7055

Stop clearing the database cache on rake cache:clear

See merge request !7056

Fix documents and comments on Build API `scope`

Fixes #23146
Fixes #19131

See merge request !7044

Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix docker.sock reference in config.toml

## What does this MR do?

`config.toml` sample did not correctly represent the `/var/run/docker.sock` mapping, causing it to be created as a volume instead.

## Why was this MR needed?

It was broken.

See merge request !5172

Support LDAP login tabs wrapping to second line (and a few other login fixes)

## What does this MR do?

Fixes some regressions introduced for customers with multiple servers configured for login and/or long label names.

Also, improves styling for the login page on small screens. 

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

See the bad behavior here: https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117893

## Screenshots (if relevant)

![2016-10-19_16.34.00](/uploads/2816545b4db60ddb6430c458c2c41582/2016-10-19_16.34.00.gif)

![2016-10-19_18.07.26](/uploads/53340d5894db6441cc82b182fb47cf18/2016-10-19_18.07.26.gif)

## Does this MR meet the acceptance criteria?

- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117677

See merge request !6993

Resolve "Cycle analytics date filter is not working"

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22892

See merge request !6906

Refactor and add new environment functionality to CI yaml reference

## What does this MR do?

Add new `environment` functionality to the yaml reference.

## What are the relevant issue numbers?

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23484

See merge request !7026

Attempting to generate default set of labels would result in
an error:

ArgumentError: wrong number of arguments (given 1, expected 0)

Closes #23649

Fix bug where e-mails were not being sent out via Sidekiq

Fix bug where e-mails were not being sent out via Sidekiq

By default, ActionMailer uses the "mailers" queue, but this entry
was not included in the list of queues for Sidekiq to use.

For more details:

* https://github.com/plataformatec/devise/wiki/How-To:-Send-devise-emails-in-background-(Resque,-Sidekiq-and-Delayed::Job)
* http://guides.rubyonrails.org/active_job_basics.html

See merge request !7053

By default, ActionMailer uses the "mailers" queue, but this entry
was not included in the list of queues for Sidekiq to use.

For more details:

* https://github.com/plataformatec/devise/wiki/How-To:-Send-devise-emails-in-background-(Resque,-Sidekiq-and-Delayed::Job)
* http://guides.rubyonrails.org/active_job_basics.html

Fix wrong example in api/users documentation

## What does this MR do?

Just a small typo fix in API docs. While greping for this typo I also found couple more places with same mistake and included them in the MR too.

See merge request !7043

fix font weight of project feature settings

## What does this MR do?
Fixes font weight for project feature settings

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-10-14_at_9.49.06_AM](/uploads/76e1f91cd8f6fcf9197a51215b497e4a/Screen_Shot_2016-10-14_at_9.49.06_AM.png)

After:
![Screen_Shot_2016-10-14_at_11.43.44_AM](/uploads/ecb378400d787c50dba2c3833bb72964/Screen_Shot_2016-10-14_at_11.43.44_AM.png)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_16964612

See merge request !6902

Use separate queues for all Sidekiq workers

## What does this MR do?

This MR updates all workers so that they (mostly) use their own Sidekiq queues. This in turn allows us to monitor queues more accurately and in the future impose queue specific throttles, limits, etc.

This is a critical part we need in 8.13, despite it being so close to release day.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 for more information.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/23370

See merge request !7006

Grammar fixes in docs

Some minor grammar fixes in a page in the docs

See merge request !6645

Changed gitlab-shell version to avoid warning when precompiling the assets.

## What does this MR do?

Changes installation instructions from source to install v3.6.1 of gitlab-shell to avoid a pre-compile warning on gitlab.

See merge request !6747