delta/gitlab/gitlab-ce.git, branch bradjones1/gitlab-ce-patch-3

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

2016-10-25T20:27:57+00:00

Merge branch 'sh-optimize-label-finder' into 'master'

2016-10-25T15:55:59+00:00


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

Merge branch 'patch-7' into 'master'

2016-10-25T15:49:44+00:00


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

Merge branch 'temporarily-revert-appending-templates-before-long-term-ux-fix' into 'master'

2016-10-25T15:28:59+00:00


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

Merge branch 'tidy-up-pipeline-js' into 'master'

2016-10-25T15:23:35+00:00


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

Merge branch '22743-issue-tooltip-will-not-disappear-going-back-to-previous-page' into 'master'

2016-10-25T15:15:29+00:00


Close any open tooltips before page:fetch

## What does this MR do?

Resolve #22743 by removing any open tooltips before `page:fetch`.

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

## Why was this MR needed?

Open tooltips were never closed (could never be) in certain browsers after navigating with Turbolinks and going back.

## 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)
- [ ] 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 #22743

See merge request !6795

Merge branch 'improve-grape-dsl-rules' into 'master'

2016-10-25T15:12:43+00:00


Add an API styleguide

This adds a styleguide for API development. Spinned-of from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6860#note_16922017.

[ci skip]

See merge request !6864

Merge branch 'add-test-for-snippet-download' into 'master'

2016-10-25T14:49:27+00:00


Adds test for feature in this MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6720

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6720

See merge request !6854

Reduce overhead of LabelFinder by avoiding #presence call

2016-10-25T13:52:44+00:00

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 the system
so that #presence and hence to_a isn't called.

Closes #23684

Merge branch 'enable-scss-lint-single-line-per-selector' into 'master'

2016-10-25T13:52:26+00:00


Enable SingleLinePerSelector in scss-lint

## What does this MR do?
Enables `SingleLinePerSelector` in `.scss-lint.yml`

## Are there points in the code the reviewer needs to double check?
This MR touches a lot of files, just need another pair of eyes to look through and make sure I didn't break anything.

## Why was this MR needed?
Improve SCSS maintainability and consistency

## Screenshots (if relevant)
None

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

See merge request !7081