Closes #21417

Merge branch '18851-commit-text-in-activity-commits-page-etc-has-the-wrong-line-height' into 'master'

Changed `.commit-row-title` `line-height` to `1.35` from `1`

## What does this MR do?

Changes `.commit-row-title` `line-height` to `1.35` from `1`, this is to match the `line-height: 20px;` from before 41c2ea9b.

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

## Why was this MR needed?

Not enough space between commit lines

## What are the relevant issue numbers?

Closes #18851.

## Screenshots (if relevant)

New screenshot below.

## 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)
Closes #18851

See merge request !5996

Reduce intermittent spec failures by making VueJS resource interceptor decrement outstanding resource counts when HTTP response is received

Before the count would be reduced 500 ms after a DOM update tick, which could cause race conditions since the `DatabaseCleaner` could run in the middle of a Rails controller handling the response.

Partial fix to #21197 and other intermittent spec failures.

See merge request !6224

increased checkbox and filter button padding

## What does this MR do?

fixed misalignments as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/19110

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

Not that I know of

## Why was this MR needed?

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

## Screenshots (if relevant)

![image](/uploads/e7c5ffe78e1a5b67fa0335ba1c231df2/image.png)

![image](/uploads/1591ed872e765da3b5ed071c8872194f/image.png)

## 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)
- [x] 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 https://gitlab.com/gitlab-org/gitlab-ce/issues/19110

See merge request !6206

Removed `margin-bottom`

Corrected commit-actions margin

Reverted action margin for a more logical approach

Change "check out, review, and merge locally" URL to SSH by default.

## What does this MR do?

Change the default URL type  in the "Check out, review, and merge locally" pop-up dialog to SSH.

## Why was this MR needed?

The default URL to show on the project screen is the SSH URL, so it makes sense for it to be the default here too. Plus, since most people (hopefully) use SSH keys to avoid typing credentials repeatedly, changing this default means these commands can be pasted into a terminal more easily since no password prompt will get in the way.

## Does this MR meet the acceptance criteria?

- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [n/a ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [n/a] API support added
- Tests
  - [n/a] 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 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 !6211

Updated gitlab_git to 10.6.3

## What does this MR do?

This updated gitlab_git to 10.6.3

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

See merge request !6132

Support empty PG database too

cc @rdavila @axil

See merge request !6221

Using the default protocol here (vs HTTP only) is more convenient
when it comes to pasting these commands into a terminal.

This allows us to take advantage of
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/121.

Handle variable values

## What does this MR do?
User can display variables on click. Variables will hide after page is refresh.

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

## Screenshots (if relevant)
![Zrzut_ekranu_z_2016-08-23_16_32_29](/uploads/649576b5c77fc4636924de00ddb0f190/Zrzut_ekranu_z_2016-08-23_16_32_29.png)
![Zrzut_ekranu_z_2016-09-01_17_59_40](/uploads/7e96210b9c8354f0b406b9df8018a94c/Zrzut_ekranu_z_2016-09-01_17_59_40.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] 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)

cc: @kradydal @grzesiek @yorickpeterse [@chastell](https://github.com/chastell) @tmaczukin 

See merge request !5628

add feature test

add feature test

add feature test

remove test to builds_spec

remove feature test to builds_spec

remove feature test to builds_spec

add changes to methods and remove FactoryGirl

add changes to methods and remove FactoryGirl

adding changes to test and js file

changes grammar

update changelog

rename file name

update files after review

update files after review

update files after review

show variables on-click

show variables on-click

show variables on-click

remove = and add new js classes into sidebar.scss

show variables by clicking button

show variables by clicking button

show variables by clicking button

show variables by clicking button

use id for a class

add nicescroll

add nicescroll

update CHANGELOG

Merge branch '19814-regression-snippet-pagination-on-user-page-leads-to-raw-json-instead-of-normal-webpage' into 'master'

Fix pagination on user snippets page

## What does this MR do?

Copy the pagination code from projects -> snippets on a user's profile page.

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

Don't think so.

## Why was this MR needed?

It was a bug!

## Screenshots (if relevant)

(I set the pagination to two per page for this, because I'm lazy.)

![Snippets](/uploads/986abd8608cda1cd76416e55b2c3a3ba/Snippets.gif)

## Does this MR meet the acceptance criteria?

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

See merge request !6179

decrement outstanding resource counts when HTTP response is received

Before the count would be reduced 500 ms after a DOM update tick, which could
cause race conditions since the `DatabaseCleaner` could run in the middle of
a Rails controller handling the response.

Partial fix to #21197 and other intermittent spec failures.

Fix repository page ui issues

## What does this MR do?

Fixes 3 UI issues outlined in https://gitlab.com/gitlab-org/gitlab-ce/issues/19610. 

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

Not afaik. 

## Why was this MR needed?

To fix problems with the UI noted in relevant issues.

## What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19610 (combines all three) also

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19614, Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19615, Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19616

Integrates changes from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5530/diffs?view=parallel

## Screenshots (if relevant)

Right align & color contrast issues (https://gitlab.com/gitlab-org/gitlab-ce/issues/19614 & https://gitlab.com/gitlab-org/gitlab-ce/issues/19616)

Before: 

![no-contrast](/uploads/9dec2510250806434cf686d6362eda4d/Screen_Shot_2016-07-07_at_1.46.08_PM.png)
![left-align](/uploads/09ddc525491010538d7bce95c410a067/Screen_Shot_2016-07-07_at_1.42.17_PM.png)

After: 

![right-align-and-contrast](/uploads/0d303179150ce718a28cd38ddbbf2954/right-align-and-contrast.png)

Truncate last commit (https://gitlab.com/gitlab-org/gitlab-ce/issues/19615)

Before: 
![not-truncated](/uploads/e66213db28d11cc44e7eb8578ac788fd/Screen_Shot_2016-07-07_at_1.40.26_PM.png)
After: 

![truncated-commit-message](/uploads/94947234451f29c34df3c2bd8846193d/truncated-commit-message.png)


**UPDATED screenshot![Screen_Shot_2016-09-02_at_2.15.04_PM](/uploads/dc11e6159759818b5ea69e04206c5691/Screen_Shot_2016-09-02_at_2.15.04_PM.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 !5308

Test migration paths

## What does this MR do?

It checks out the code base at v8.0.5, seeds the database, and runs all migrations. 

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

If this might make sense, does this simulate enough what happens in the real world.

## What are the relevant issue numbers?

Closes #14549 

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4874

Better document triggers docs

## What does this MR do?

- Refactor the triggers page view
- Replace old images with new ones
- Mention triggers in `ci/yaml/README.md`

## Screenshots (if relevant)

The new triggers views contains more information and is prettier :)

## Before

![screenshot-localhost_3000_2016-09-06_10-53-10](/uploads/8f45a0e21a31f1819af1739f7af8afd0/screenshot-localhost_3000_2016-09-06_10-53-10.png)

# After

![screenshot-localhost_3000_2016-09-06_10-36-34](/uploads/2bbe2801b0f959851a8cfa5a8a14623d/screenshot-localhost_3000_2016-09-06_10-36-34.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] 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?

Closes #21773

See merge request !6217

Clean up search result classes

## What does this MR do?

Clean up search result classes

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

I checked if those methods are used and it seems like NO. But you can check as well.

## Why was this MR needed?

To be clean

See merge request !6216

This commit adds a job to the pipeline to test if migration on seed
data works. Even though the seed data is not perfect, it does give more
guarentees that this will succeed in the real world too.

seed_fu is used instead of dev:setup to save some time, as they both
generate the data in the same way, this should be fine.

First check if there is a result on the migration, else there is
nothing to do

Hide build spinner on canceled builds

## What does this MR do?

If the build has canceled this correctly hides the spinner

## What are the relevant issue numbers?

Closes #19651 

## Screenshots (if relevant)

![Screen_Shot_2016-07-11_at_13.51.57](/uploads/8342470cf35dae7c67168d9153592fb6/Screen_Shot_2016-07-11_at_13.51.57.png)

See merge request !5182

Remove gitorious from import_sources on ApplicationSetting model

Removes 'gitorious' as import field from the import_sources field on ApplicationSetting

Closes #21804

cc @markglenfletcher

See merge request !6180

Refactor merge requests documentation

## What does this MR do?

Add more information on merge requests.

## Moving docs to a new location?

See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location

- [x] Make sure the old link is not removed and has its contents replaced with a link to the new location.
- [x] Make sure internal links pointing to the document in question are not broken.
- [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory.
- [x] If working on CE, submit an MR to EE with the changes as well.

---

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

See merge request !6202