Fix changelog



See merge request !6035

Add lock_version to merge_requests table

Add lock_version to merge_requests table

Closes #21465

It appears this column was mistakenly omitted in !5623 due to rebasing
issues in earlier comments.

See merge request !6037

Fix groups sort dropdown alignment

## What does this MR do?
Changes the dropdown located on the [explore groups page](https://gitlab.com/explore/groups) from left aligned to right aligned.

## Are there points in the code the reviewer needs to double check?
Shouldn't be

## Why was this MR needed?
Keeps the UI consistent for dropdowns as they are right aligned on other pages

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

## Screenshots (if relevant)

Before:
![Screen_Shot_2016-08-23_at_11.21.01_AM](/uploads/9723d0166b80dcb8d7b0228063e39a77/Screen_Shot_2016-08-23_at_11.21.01_AM.png)

After:
![Screen_Shot_2016-08-23_at_11.20.52_AM](/uploads/5a55a72c10909142d02a23710736a93f/Screen_Shot_2016-08-23_at_11.20.52_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 !5963

Closes #21465

It appears this column was mistakenly omitted in !5623 due to rebasing
issues in earlier comments.

Remove max height on pipelines graph

#### What does this MR do?
Removes max-height from pipeline graph

#### Why was this MR needed?
The height was originally put in place because some stages have ~20 tests, which ends up looking a little lopsided and there's a large amount of white space. The scrolling container, however, is not the best solution and ends up being more difficult to scroll around to find what you're looking for. For now we can remove the height, and eventually we'll have the similar tests collapsed.

#### Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-24_at_11.32.39_AM](/uploads/1b32403548c6f7f4189a19279f13b84b/Screen_Shot_2016-08-24_at_11.32.39_AM.png)
After:
![Screen_Shot_2016-08-24_at_11.28.57_AM](/uploads/1327e37429b881265429f559d9d56482/Screen_Shot_2016-08-24_at_11.28.57_AM.png)

See merge request !5988

Fix inline emoji text alignment

## What does this MR do?
Changes the vertical alignment of inline emoji text from `middle` to `top`

## Are there points in the code the reviewer needs to double check?
Potential emoji side effects (I couldn't find any)

## Why was this MR needed?
Fixes UI inconsistency

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

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-25_at_9.57.41_AM](/uploads/b7ce1da8d0eaaea3391502238a92fc77/Screen_Shot_2016-08-25_at_9.57.41_AM.png)

After:
![Screen_Shot_2016-08-25_at_9.57.49_AM](/uploads/8649c14764c3f616c487be115505c49a/Screen_Shot_2016-08-25_at_9.57.49_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 !6027

Remove ugly horizontal scrollbars in windows

## What does this MR do?
Removes horizontal scrollbars from pipelines view 

## Why was this MR needed?
It looked terrible.

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

See merge request !5942

Fix unnecessary horizontal scroll area in pipeline visualizations

## What does this MR do?

Removes a min-width attribute for the build pipeline visualization wrapper

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

I am curious why this line was there in the first place.  Perhaps I'm just not seeing it.

## Why was this MR needed?

I was noticing an unnecessary horizontal scroll bar when viewing pipeline visualizations embedded in merge request builds tab:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5627/builds

## What are the relevant issue numbers?

Line appears to have been introduced in !5742

## Screenshots (if relevant)

![Screen_Shot_2016-08-24_at_11.15.13_PM](/uploads/e395ed8d4415187735d06b8386fe4633/Screen_Shot_2016-08-24_at_11.15.13_PM.png)

## Does this MR meet the acceptance criteria?

As this is a very simple cosmetic change, I don't think it warrants inclusion in the changelog, documentation, or tests.

- [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 !6005

Handle non-UTF-8 conflicts gracefully

## What does this MR do?

If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI.

## What are the relevant issue numbers?

Closes #21247. 

See merge request !5961

If the received id is still a pending todo mark it as done

## What does this MR do?

Just return properly on stale todos, for me is annoying to mark as done a todo that is already done and the done hung there forever, so I have to refresh the page. I decided to resolve the issue myself.

## What are the relevant issue numbers?

Closes #19730

See merge request !5795

rename Statuseable to HasStatus

## What does this MR do?

- Rename all instances of Statuseable in the codebase, to HasStatus
- Rename all files from statuseable to has_status

## What are the relevant issue numbers?

Closes #21103 

See merge request !6003

Label list shows all issues (opened or closed) with that label

## What does this MR do?

Change the label list to shows all issues (opened or closed) with that label.

## What are the relevant issue numbers?

Closes #21257

See merge request !5991

Remove gitorious

## What does this MR do?

Remove gitorious as import source

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

Did I remove everything?

## Why was this MR needed?

This button yielded a 404

## What are the relevant issue numbers?

Closes #17062 

/cc @JobV 

See merge request !5866

Handle unavailable system info

## What does this MR do?

Handle the case where we can't get system info without blowing up. As this is the first tab in the monitoring section, it's difficult to get to the other tabs if this page throws a 500. Also be more specific about the info we want, so we don't fail on something we don't care about (like `/proc/net/dev`).

## Why was this MR needed?

grsecurity can prevent users from reading `/proc`, which is what Vmstat uses to find CPU and memory info.

## What are the relevant issue numbers?

Closes #21378.

See merge request !5989

Fix wrong Koding link



See merge request !6030

Ensure all javascripts use GitLab install directory as the cookie path.

## What does this MR do?

Fixes #20435 and standardizes all JavaScript-set cookies to use the same root url.

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

Nothing I can think of.  This MR is pretty straight forward.

## Why was this MR needed?

Cookie paths were inconsistent across front-end scripts.  Some would default to '/' and others had no set path and would end up tied to whatever page they were set on.  Also as @connorshea noted, we cannot assume GitLab is installed at '/'.

Before:

![Screen_Shot_2016-08-02_at_10.01.18_AM](/uploads/fa0238e2edf67a8e8ff48f8ee9c8d955/Screen_Shot_2016-08-02_at_10.01.18_AM.png)

After:

![Screen_Shot_2016-08-02_at_10.03.03_AM](/uploads/f1b95936d6f95f2ef1d7db10b5fb09d1/Screen_Shot_2016-08-02_at_10.03.03_AM.png)


## What are the relevant issue numbers?

#20435

## Screenshots (if relevant)

see above

## 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)
- 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 !5627

Adds response mime type to transaction action name when it's not HTML

See merge request !5939

Automatically expand hidden discussions when accessed via a permalink hash (closes #19304)

## What does this MR do?

Addresses "Auto-expand a discussion note when we arrive via anchor" (issue #19304)

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

Let me know if the code is consistent with community standards (not 100% sure about indentation of chained jQuery actions)

I don't think this MR warrants any unit tests or documentation, but let me know if you disagree.  I'll add the requisite CHANGELOG entry upon approval.

## Why was this MR needed?

Currently, if a discussion is accessed via a permalink to an "outdated" diff discussion, the anchor will not bring you to the expected part of the page.

## What are the relevant issue numbers?

#19304 

## 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)
- Tests
  - [ ] Added for this feature/bug
  - [ ] 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 !5585

Moved two 8.11 changelog entries to 8.12

See merge request !6022

[ci skip]

Reduce number of database queries on builds tab

See merge request !5957

Display project icon from the default branch instead of master

See merge request !5792

Fix markdown link in doc_styleguide.md



See merge request !6021

[ci skip]

This commit makes sure that the project icon is
being read from the default branch instead of
'master'