https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17543036

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17522443

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17522557

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17397573

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17397201
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17397461
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6801#note_17468470
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17482654

* upstream/master: (65 commits)
  Fixed typo in css class
  Merge branch 'airat/gitlab-ce-23268-fix-milestones-filtering' into 'master'
  Escape quotes in gl_dropdown values to prevent exceptions
  Fixes various errors when adding deploy keys caused by not exiting the control flow.
  Fix typo on /help/ui to Alerts section
  Grapify tags API
  Add 8.13.1 CHANGELOG entries
  Fix sidekiq stats in admin area
  Remove use of wait_for_ajax since jQuery was removed
  Specify which Fog storage drivers are imported by default in backup_restore.md
  Moved avatar infront of labels
  Don't schedule ProjectCacheWorker unless needed
  Fixed height of sidebar causing scrolling issues
  Reduce overhead of LabelFinder by avoiding #presence call
  Fixed users profile link in sidebar Fixed new labels not being created
  Improve redis config tasks for migration paths job
  Ensure search val is defined.
  Ensure cursor is applied to end of issues search input.
  Increase debounce wait on issues search execution.
  Keep the new resque.yml aside and use it once we've checked out master
  ...

See merge request !7086

Changed .visable-sm to .visible-sm

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

Issue board sidebar

## What does this MR do?

Adds a sidebar when clicking an issue in the issue boards lists. This allows user to easily update other parts of the issue details without having to visit the issue itself. Same functionality as on issue page.

When creating a new issue the sidebar automatically opens.

## Screenshots (if relevant)

![Screen_Shot_2016-10-07_at_13.10.16](/uploads/ad08785f407d8ac3fe9cb078868a7839/Screen_Shot_2016-10-07_at_13.10.16.png)

## What are the relevant issue numbers?

Closes #21219

See merge request !6690

Fix refs dropdown selection with special characters

## What does this MR do?

Remove unneeded encode from the project-refs-dropdown renderRow method.

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

## Why was this MR needed?

## Screenshots (if relevant)

![2016-10-23_01.20.19](/uploads/1f176b2aa633093851799ae9f70f116b/2016-10-23_01.20.19.gif)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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?


Closes #21248

See merge request !7061

Fix Sidekiq process stats in admin area

Closes #23825

See merge request !7116

Fix filtering of milestones with quotes in title

Closes #23268

See merge request !6900

users should remove former Go installation folder

## What does this MR do?

It ensure users installing or updating from source will remove their former Go installation folder in `/usr/local/go`, to avoid raising errors that could lead to new issues being created.

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

1. The `rm -rf` should not be verbose if folder does not exists.
1. May a user have some kind of configuration files in this folder ?

## Why was this MR needed?

I did faced the error, that led me to the solution stated here : https://gitlab.com/gitlab-org/gitlab-workhorse/issues/29#note_4155517

gitlab-org/gitlab-workhorse#29

See merge request !6602

See merge request !6784

When adding a deploy key that already exists in the project the existing key would not be returned, resulting in an attempt to create a new one, which in turn caused a 500 error due to an ActiveRecord exception.

When adding a deploy key that exists within another project the key would be joined to the project, but would also attempt to create a new one, which resulted in a 400 error due to the key already existing.

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

See merge request !6915

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

Grapify tags API

## What does this MR do?

Add the Grape-DSL to the tags API.

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

The delete endpoint only has a description but no success entity because we don't have one. We only return the branch name as JSON. Should I do something else?

## What are the relevant issue numbers?

Related to #22928

See merge request !6860

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

Remove use of wait_for_ajax since jQuery was removed

Fixes #23812

See merge request !7111

Replace jquery-cookie plugin with js-cookie

## What does this MR do?

Removes an outdated and unmaintained dependency [jquery.cookie](https://github.com/carhartl/jquery-cookie) with its successor [js.cookie](https://github.com/js-cookie/js-cookie) which is not dependent on jQuery.

Also this MR adds a global default cookie `path` setting which defaults to the GitLab root directory.  Now, setting a cookie to any path other than `gon.relative_url_root` requires an explicit opt-out.  This is a sensible default and should prevent accidental omission going forward.

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

Double check that all instances of `$.cookie(x)` have been replaced by `Cookies.get(x)` and all instances of `$.cookie(x, y, z)` are replaced with `Cookies.set(x, y, z)`.  All javascripts which set or retrieve cookie values should function just as before.

## Why was this MR needed?

One more step toward shaking off jQuery as a dependency (#23022), also [jquery.cookie](https://github.com/carhartl/jquery-cookie) is no longer maintained and hasn't seen an update in 2+ years.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
  - [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?

#23022

See merge request !7085

Fixes #23812

Specify which Fog storage drivers are imported by default in backup_restore.md

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5783

See merge request !7108

Specify which Fog storage drivers are imported by default in backup_restore.md

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5783

See merge request !7072

Make issues search less finicky

## What does this MR do?

1. Tracks issues search pristine-ness, to ignore non-mutating keyups.
2. Increase debounce wait on issues search execution from 500ms to 1000ms.
3. Ensures issues search retains focus after search execution

Note: Issues search is being overhauled (https://gitlab.com/gitlab-org/gitlab-ce/issues/21747), so most (if not all) of these changes will no longer be used. But given that the overhaul has been pushed back a release (8.14?), it makes sense to do some quick fixes to improve UX in the meantime.

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

Will adding autofocus to the search input create unforeseen problems?

## Why was this MR needed?

- At the moment, issues search is run on any keyup, even if search terms remain the same. This is an oversight that is both a tax on servers and an annoyance to users. 

- Searches are executed pretty quickly after a gap in keyups. It's too fast according to internal and enterprise customer feedback.

- Focus is lost when a search is conducted, so you have to either tab to (any sane person would not do this, given our tab order) or reach for the mouse and select the input again. 

These are all pretty heavily complained about issues that are, to quote community users, "rage-inducing" and "major accessibility issue[s]".

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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
  - [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 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?

https://gitlab.com/gitlab-org/gitlab-ce/issues/21503
https://gitlab.com/gitlab-org/gitlab-ce/issues/21984
https://gitlab.com/gitlab-org/gitlab-ce/issues/21597

See merge request !6735

Fix the `migration paths` CI job

## What does this MR do?

It fixes the `migration paths` CI job. This job started failing at the time we added a migration that is actually using Redis.

The issue was that the `config/resque.yml` file we're using is not back-compatible with the `v8.5.9` version we're checking out in the first part of the job, that's why we're using a UNIX socket for this version.

To fix the issue:

* We use 'SETUP_DB: 'false'` in the job variables to speed up the job (it does not make sense to run migration before checking out v8.5.9)
* We just copy config/resque.yml.example to config/resque.yml at is simply has correct structure when checked out from v8.5.9
* When we revert to CI_BUILD_REF, we run prepare script again, which swaps config/resque.yml again, using new version this time.

Fixes #23658.

Note: the `migration paths` CI job is run on `master` only but you can see a successful build here: https://gitlab.com/gitlab-org/gitlab-ce/commit/fd99ec1a8ecc49ef70c4358ca7be2987f2a7505f

See merge request !7092

Fix events order in users/:id/events endpoint

## What does this MR do?

Order of events in contributions API is currently being lost, though docs are saying:

> Get the contribution events for the specified user, sorted **from newest to oldest**.

Order becomes different after `.merge(ProjectsFinder.new.execute(current_user))` call, so I moved ordering below this line.

This MR also removes extra `.page(params[:page])` call in the method chain, since [`paginate(events)` already does it](https://gitlab.com/airat/gitlab-ce/blob/master/lib/api/helpers.rb#L112).

See merge request !7039

Don't schedule ProjectCacheWorker unless needed

## What does this MR do?

This MR changes `ProjectCacheWorker.perform_async` so scheduling only takes place when needed. See the commits for more details.

See merge request !7099

Reduce overhead of LabelFinder by avoiding #presence call

Some users experienced 502 timeouts when viewing group labels.
Labels#open_issues_count and Label#open_merge_requests_count were
taking a long time to load because they were loading every ActiveRecord
of the user-accessible projects into memory. This change modifies so
that only the IDs are loaded into memory.

Closes #23684

See merge request !7094

This will change the update process to checkout gitlab-shell version 3.6.6 instead of 3.6.3 as currently described in the update document

See merge request !6976

Stop appending templates - Temporary fix

## What does this MR do?

This is the temporary fix for #23315. This stops the templates appending to any existing text.

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

## Why was this MR needed?

Temporary fix for #23315.

## Screenshots (if relevant)

![2016-10-21_21.58.55](/uploads/ba54d89fcb2fb9cf99ff24c8623ae413/2016-10-21_21.58.55.gif)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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?

See merge request !7050

Tidied up pipelines.js.es6 and removed jQuery where acceptable.

## What does this MR do?

A week or so ago, I made some changes to `pipeline.js` as it was a single function and we now needed to expand on the JS logic for pipelines. I decided to turn it into `class Pipelines` of `pipelines.js.es6`. To avoid review confusion I held back from changing the pre-existing function so it dealt with instance members. Every time you click the button it would re-query all the elements it needed, now its a class it doesn't need that as we can store the required elements on construction.

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

## Why was this MR needed?

## Screenshots (if relevant)

## 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?

See merge request !6950