real pending time, because that's actually by definition,
(the time that it's not running!)
or we could end up with awfully complicated algorithm :(

* upstream/master: (289 commits)
  Fix a typo
  Change minimum Unicorns required to two
  Update memory requirements
  Change the inline code to codeblocks for the new features doc guideline
  Update CHANGELOG with 8.11.4 entries.
  removed null return - renamed 'placeTop' to 'placeProfileAvatarsToTop'
  Change widths of content in MR pipeline tab
  Add curve to generic commit status pipeline
  Rubocop syntax 2.3
  Some minor updates for upgrade guides for 8.12.
  Remove inconsistent font weight for sidebar's labels
  Replace play icon font with svg
  Project tools visibility level
  Added todo filter tests
  Fixed project filtering
  Review changes, simplified dropdown init
  Removed select2 from todos feature spec
  Removed inline JS and improved dropdown labels
  Added type and action dropdowns, need to finalize by removing all inline and polishing off the selected dropdown states
  Completed project filter dropdown, still need to move it from inline to ProjectSelect.js (or different)
  ...

retries and probably also manual actions!

Feedback:

* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14735478
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14737804

Update memory requirements docs

## What does this MR do?
It doubles the memory requirements in the docs.

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

## Why was this MR needed?
To reflect the requirements for decent operation, until we bring such requirements down.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-com/infrastructure/issues/19

## Screenshots (if relevant)
N/A

## Does this MR meet the acceptance criteria?

- [] ~~[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)
- [ ] ~~API support added~~
- ~~Tests~~
  - [ ] ~~Added for this feature/bug~~
  - [ ] ~~All builds are passing~~
- [ ] ~~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)

See merge request !6016

Change the inline code to codeblocks for the new features doc guideline

Change the inline code to codeblocks for the new features doc guideline
for better clarity.

See merge request !6168

[ci skip]

Update CHANGELOG with 8.11.4 entries.



See merge request !6159

Remove inconsistent font weight for sidebar's labels

## What does this MR do?
Removes the `.bold` css class from the sidebar label default value so that it is no longer bold 😄 

**None** => None

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

## Why was this MR needed?
Fixes a UI inconsistency

## What are the relevant issue numbers?
Closes #21141 

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-24_at_9.41.11_AM](/uploads/3e416d45531b7322474922c569225c03/Screen_Shot_2016-08-24_at_9.41.11_AM.png)

After:
![Screen_Shot_2016-08-24_at_9.40.57_AM](/uploads/a4d60d4cd0a57142ad6c0c8a25be5342/Screen_Shot_2016-08-24_at_9.40.57_AM.png)

## Does this MR meet the acceptance criteria?

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

See merge request !5984

Fix inconsistent checkbox alignment

## What does this MR do?
Vertically aligns the checkboxes to the top so that it is aligned with the issue titles

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

## Why was this MR needed?
Fixes existing UI inconsistency

## What are the relevant issue numbers?
Closes #21398

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-25_at_12.43.21_PM](/uploads/c494d6200e2068feb324db932851cdc0/Screen_Shot_2016-08-25_at_12.43.21_PM.png)

After:
![Screen_Shot_2016-08-25_at_12.41.51_PM](/uploads/42241a150c886592ff92a5840090c589/Screen_Shot_2016-08-25_at_12.41.51_PM.png)

## Does this MR meet the acceptance criteria?

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

See merge request !6032

Front End - Rewrote ES5 `user.js` to ES6 `user.js.es6`

## What does this MR do?

This MR removes the `users.js` file in `app/assets/javascripts/users.js` and replaces it with ES6.

* It also adds the file extension `.es6` so that the sprockets babel gem can transpile it to ES5.
* The new file is: `users.js.es6` in `app/assets/javascripts/`
* Replaced `new User` with `new gl.User` in `app/views/users/show.html.haml`

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

I followed the AirBnb guide, but if there are any mistakes let me know!

## Why was this MR needed?

Because the entire coffee script codebase was transferred over to ES5 with a plan to move everything over to ES6 😄 

## What are the relevant issue numbers?

#20098 

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- Tests
  - [x] All builds are passing
- [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)

See merge request !5676

Add the total number of issues in the JSON response in issue board lists

## What does this MR do?

Add the total number of issues in the JSON response in issue board lists

## Why was this MR needed?

The issue board lists should always show the total number of issues in the list, not the current amount fetched by endless scroll.

Closes #21327

See merge request !5904

Change widths of content in MR pipeline tab

## What does this MR do?
* Fixes width of items in pipelines tab
* Removes scrollbars on Windows

## Screenshots (if relevant)
![Screen_Shot_2016-09-01_at_2.40.55_PM](/uploads/2163022eb325b9b0eca2f2003416e100/Screen_Shot_2016-09-01_at_2.40.55_PM.png)

#### What are the relevant issue numbers?
Closes #21396 
Closes #21781

See merge request !6157

Merge branch '21508-inconsistency-personal-dashboard-todos-page-uses-old-interface-wrong-dropdown-filter-buttons' into 'master'

Update todo view filter dropdowns

## What does this MR do?

Swaps out old `select2` dropdowns on todo page with newer dropdowns.

Also removes todo inline JS.

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

## Why was this MR needed?

## Screenshots (if relevant)

### Project

![2016-08-29_14.02.57](/uploads/73d610fd41d202540f3770afa7e5266f/2016-08-29_14.02.57.gif)

### Author

![2016-08-29_14.03.40](/uploads/8ce97b81c91db06111f6a930cd5fb293/2016-08-29_14.03.40.gif)

### Type

![2016-08-29_14.04.32](/uploads/1aa050a7822de1d99ee7fdc3bbc621a3/2016-08-29_14.04.32.gif)

### Action

![2016-08-29_14.05.23](/uploads/680d19c56723a222274c3677f941cfcd/2016-08-29_14.05.23.gif)

## 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - 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 #21508 

Related to #19866

See merge request !6072

Remove prefixes from transition CSS property

## What does this MR do?
Removes vendor prefixes from the CSS transition property

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

## Why was this MR needed?
Reduces unnecessary CSS

## Screenshots (if relevant)
None

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [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?
Closes #21614

See merge request !6093

Add curve to generic commit status pipeline

#### What does this MR do?
Add curve to generic commit status pipeline

#### Screenshots (if relevant)
Before:
 ![Screen_Shot_2016-09-01_at_1.35.29_PM](/uploads/e4585462d50d426bcad66ae571387ddc/Screen_Shot_2016-09-01_at_1.35.29_PM.png)
After:    
![Screen_Shot_2016-09-01_at_1.35.21_PM](/uploads/fe62a7e5fc27c9c1bb3553fdc63c5cc6/Screen_Shot_2016-09-01_at_1.35.21_PM.png)

See merge request !6156

Enable Ruby 2.3 for rubocop too



See merge request !6153

Optimize branch lookups and force a repository reload for Repository#find_branch

See merge request !6087

Some minor updates to upgrade guides for 8.12.

See merge request !6154

Resolve "Inconsistency: Repo Title "down caret" cropped on smaller viewports"

## What does this MR do?

Fixes an issue where the dropdown chevron for a project list was not visible on smaller viewports.

This MR also changes the dropdown trigger into a `button` element for better accessibility (it can now be tabbed to like any link).

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

None that I can think of.

## Why was this MR needed?

Better accessibility and support for smaller viewports.

## Screenshots (if relevant)

Dropdown toggle now targetable by pressing tab to select.
![Screen_Shot_2016-08-31_at_9.12.15_PM](/uploads/8b2038a8ae259efd32da2e94a309ce88/Screen_Shot_2016-08-31_at_9.12.15_PM.png)

Chevron no longer hidden when project title length triggers `overflow: ellipsis`.
![Screen_Shot_2016-08-31_at_9.13.38_PM](/uploads/382e76c06e54bc307106a84ec21ab892/Screen_Shot_2016-08-31_at_9.13.38_PM.png)

## Does this MR meet the acceptance criteria?

- [x] CHANGELOG entry added
- Tests
  - [x] All builds are passing
- [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?

Closes #21506

See merge request !6140

Replace play icon font with svg

## What does this MR do?
Replaces the `play` font awesome icon with svg

## Are there points in the code the reviewer needs to double check?
Make sure that the svg is looking great on all the changed pages

## Why was this MR needed?
SVG is better than fonts 😄 

## What are the relevant issue numbers?
 #21455 

## Screenshots (if relevant)
Before (Pipeline):
![Screen_Shot_2016-08-26_at_4.16.16_PM](/uploads/90a75b91b516e643f2134e053b0d7590/Screen_Shot_2016-08-26_at_4.16.16_PM.png)

After (Pipeline):
![Screen_Shot_2016-08-26_at_4.15.49_PM](/uploads/44e44a3d4c14066b8b7ec8c3da36e012/Screen_Shot_2016-08-26_at_4.15.49_PM.png)

Before (Environments):
![Screen_Shot_2016-08-31_at_3.03.35_PM](/uploads/bd4087a9f01c1a4d3c373d2662df4fe5/Screen_Shot_2016-08-31_at_3.03.35_PM.png)

After (Environments):
![Screen_Shot_2016-08-31_at_3.00.23_PM](/uploads/0ec45031bedb271f16bea3544cbfe52b/Screen_Shot_2016-08-31_at_3.00.23_PM.png)

## Does this MR meet the acceptance criteria?

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

See merge request !6038

Center build stage columns in pipeline overview

## What does this MR do?
Centers the build stage table content and headers in the [pipeline view](https://gitlab.com/gitlab-org/gitlab-ce/pipelines)

## Are there points in the code the reviewer needs to double check?
Need to check whether it is okay to remove the following ([commit that added this property](https://gitlab.com/gitlab-org/gitlab-ce/commit/6130376ad6673facb729b78878f9156a29948a5b))
```
.light {
    width: 3px;
}
```

## Why was this MR needed?
Improve UI

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-31_at_12.46.43_PM](/uploads/cc4973d2155b59b32ec6fde714fbc26d/Screen_Shot_2016-08-31_at_12.46.43_PM.png)

After:
![Screen_Shot_2016-08-31_at_12.46.28_PM](/uploads/561d7b3973398c827d88870b38136c7d/Screen_Shot_2016-08-31_at_12.46.28_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [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?
Closes #21708

See merge request !6135

Project tools visibility level

## part of #19734   

![project_features_access_level](/uploads/81ec7185d4e61d7578652020209af925/project_features_access_level.png)

## 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] Added for this feature/bug
  - [x] All builds are passing
- [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)

See merge request !5606

Merge request sha info

## What does this MR do?

Exposes `sha` and `merge_commit_sha` items in `MergeRequest` API endpoint data.

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

No.

## Why was this MR needed?

It's useful information.

## What are the relevant issue numbers?

Closes #20456.

## Screenshots (if relevant)

N/A

## 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] Added for this feature/bug
  - [x] All builds are passing
- [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)

See merge request !5966

Use JavaScript tooltips for mentions

## What does this MR do?

- use JavaScript tooltips instead of plain title for mentions (issue, merge request, snippet, user, group, commit, commit range, milestone)

## Why was this MR needed?

JavaScript tooltips look nicer and can wrap.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5261#note_13106713, fixes #21500

See merge request !5301