Fix lint-doc error

See this build error -> https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/817

I didn't add a CHANGELOG entry because I don't think is needed but just let me know if you think we should add it

See merge request !817

Update license API docs [ci skip]

Docs for gitlab-org/gitlab-ee!400

I forgot the docs in the above merge request so here they are. This adds the new `POST /license` endpoint. 

See merge request !413

Re-organize queues for EE

See merge request !815

This builds on
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7006 and adjusts
various parts to take care of EE specific workers.

Dumping too many jobs in the same queue (e.g. the "default" queue) is a
dangerous setup. Jobs that take a long time to process can effectively
block any other work from being performed given there are enough of
these jobs.

Furthermore it becomes harder to monitor the jobs as a single queue
could contain jobs for different workers. In such a setup the only
reliable way of getting counts per job is to iterate over all jobs in a
queue, which is a rather time consuming process.

By using separate queues for various workers we have better control over
throughput, we can add weight to queues, and we can monitor queues
better. Some workers still use the same queue whenever their work is
related. For example, the various CI pipeline workers use the same
"pipeline" queue.

This commit includes a Rails migration that moves Sidekiq jobs from the
old queues to the new ones. This migration also takes care of doing the
inverse if ever needed. This does require downtime as otherwise new jobs
could be scheduled in the old queues after this migration completes.

This commit also includes an RSpec test that blacklists the use of the
"default" queue and ensures cron workers use the "cronjob" queue.

Fixes gitlab-org/gitlab-ce#23370

Port gitlab-org/gitlab-ce!7033 to EE

See merge request !814

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

Fix a search for non-default branches when ES is enabled

The issue was introduced in 8.12

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1143

See merge request !811

Fix project member access levels

Migrate invalid project members (owner -> master)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18616

See merge request !6957

Update Documentation image when configuring Build emails in Services

## What does this MR do?

Replace old GitLab image in documentation with a new image showing the new position of Services and the module 'Build emails'

## Why was this MR needed?

GitLab's layout changed with version 8.9 and the buttons were moved.

See merge request !5139

Fix broken label uniqueness label migration

The previous implementation of the migration failed on staging because
the migration was attempted to remove labels from projects that did not
actually have duplicates. This occurred because the SQL query did not
account for the project ID when selecting the labels.

To replicate the problem:

1. Disable the uniqueness validation in app/models/label.rb.
2. Create a duplicate label "bug" in project A.
3. Create the same label in project B with label "bug".

The migration will attempt to remove the label in B even if there are no duplicates.

To fix the issue, include the project ID when selecting the labels.

Closes #23609

See merge request !7030

Change target Ruby version for RuboCop to 2.1

We have to use the lowest common denominator to check the supported syntax and in our case it is Ruby 2.1. Please note that it will not help with unsupported syntax in HAML files because they are not checked by Rubocop.

See merge request !6978

[Doc] Fix `ref` parameter name for `commits/statuses`

The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`).

Tested on Gitlab CE 8.9.

See merge request !4876

Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method

See merge request !6996

The previous implementation of the migration failed on staging because
the migration was attempted to remove labels from projects that did not
actually have duplicates. This occurred because the SQL query did not
account for the project ID when selecting the labels.

To replicate the problem:

1. Disable the uniqueness validation in app/models/label.rb.
2. Create a duplicate label "bug" in project A.
3. Create the same label in project B with label "bug".

The migration will attempt to remove the label in B even if there are no duplicates.

Closes #23609

Disable warming of the asset cache in Spinach tests under CI

I suspect some combination of Knapsack tests cause no regular Rack tests
to be loaded (i.e. all JavaScript tests), which leads to the error:

ArgumentError: rack-test requires a rack application, but none was given

In CI, we precompile all the assets so there is no need to warm the
asset cache in any case.

Closes #23613

See merge request !7033

Edit glossary

Grammar fixes & new additions to the glossary page.

See merge request !7027

I suspect some combination of Knapsack tests cause no regular Rack tests
to be loaded (i.e. all JavaScript tests), which leads to the error:

ArgumentError: rack-test requires a rack application, but none was given

In CI, we precompile all the assets so there is no need to warm the
asset cache in any case.

Closes #23613

Merge branch 'ce-22457-reset-filters-button-should-be-invisible-when-no-filters-are-active-ee' into 'master'

`Reset filters` link should only be visible when filters are active

**EE version of gitlab-org/gitlab-ce!6497.**

## What does this MR do?

> Adds `issuable_filters_present` helper method to check for any filters before rendering the reset link.

## Why was this MR needed?

> `Reset filters` link is always visible.

See merge request !785

Merge branch '12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-branches-and-tags' into 'master'

Fix: Backup restore doesn't clear cache

## What does this MR do?

Clears cache when we do backup restoring. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12622



## What are the relevant issue numbers?

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

See merge request !7019

Trim project_path whitespace on form submit

## What does this MR do?

Trim leading/trailing whitespace on project_path input when focus leaves.

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

If tests are deemed necessary?

## Why was this MR needed?

To handle a reported bug #3212.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [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)
- [x] Branch has no merge conflicts with `master` (if you do - 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?


Closes #3212

See merge request !6710

When the form is submitted, any leading and/or trailing whitespace is trimmed.

Update merge_requests.md.

Error in 'Approve merge request'  section in API documentation

## What does this MR do?

Just fix an error in API Documentation in 'Approve Merge Request' section. 

Url in documentation : 
`POST /projects/:id/merge_requests/:merge_request_id/approvals`

Should be : 
`POST /projects/:id/merge_requests/:merge_request_id/approve`

(Verified on gitlab 8.12.7-ee 4051516)

See merge request !809

Don't use Hash#slice since it's not supported in Ruby 2.1

There is currently a build failure in `master` and this MR fixes it. The issue was introduced by !6879.

The problem is that `Hash#slice` doesn't exists in Ruby 2.1. I've created an issue to take care of the other places we're using `Hash#slice`: #23590

See merge request !7025

[ci skip] Add a comment explaining validate_board_limit callback

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ee/issues/929

See merge request !7023

Fix GitLab project import when a user has access only to their default namespace

## What does this MR do?

It fixes a bug when a namespace ID was not passed to `/import/gitlab_project/new` page. It occurred when a user have no choice of the namespace, so we did not render the input for namespace ID. This MR introduces a hidden input for the described case.

## Does this MR meet the acceptance criteria?

- Tests
  - [x] Added for this feature/bug
  - [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?

Fixes #23507

See merge request !6995

Create protected branches bundle

Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645

See merge request !6909

Use iid deployment refs

This fixes the 404, because `find_by` will return nil instead of throwing an error.

See merge request !7021

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

Callback associations are not common to see around. We want to make
clear that the `before_add` callback uses the number before the
addition, in this particular case 1.

Preserve note_type and position for notes from emails

Closes #23208

See merge request !7010