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

Support empty PG database too

cc @rdavila @axil

See merge request !6221

Fix expiration date picker after update

@DouweM this object is now on `gl`, not on the window. It would only break when trying to use the date picker on a newly-inserted member element, but I figure it's probably worth sneaking into a patch.

See merge request !6184

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

Fix suggested colors options for new labels in the admin area

## What does this MR do?

Execute the JS related to the suggested colors options when user access the new label in the admin area.

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

No.

## Why was this MR needed?

Clicking in a suggested color when creating a new label in the admin area don't change the background color.

## Screenshots (if relevant)

* Before

    ![2016-08-31_19.56.14](/uploads/3d50236dac578910c5062aa1e83da350/2016-08-31_19.56.14.gif)

* After

    ![2016-08-31_19.58.59](/uploads/376ffdcbb5b80ef51ab1d642fe9486d0/2016-08-31_19.58.59.gif)

## Does this MR meet the acceptance criteria?

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

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21726

See merge request !6138

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

See merge request !6087

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

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

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
Conflicts:
	app/assets/stylesheets/pages/boards.scss
	app/views/projects/boards/components/_board.html.haml

Fix confidential issues made public after import

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21803

The gitlab.com import was ignoring the confidential attribute, hence making all issues public after being imported.

The API has changed in order to also expose this field.

See merge request !1992

Scope webhooks/services that will run for confidential issues

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20661

See merge request !1986
Conflicts:
	db/schema.rb

Fix alignment of icon buttons

## What does this MR do?

Fix misalignment of buttons with only an icon which was introduced by !5451.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5451#note_14066627

## Screenshots

### Before

![with-text](/uploads/aa7f7a98e2015070689e762e0cf99844/witht-text.png)

![without-text](/uploads/72db7c54e3961fd0df34b0ea79455fd0/without-text.png)

### After

![with-text](/uploads/3f19e55773083bcb22f3909f6dc0d147/witht-text.png)

![without-text](/uploads/b6647d4d71eb5cd9d1712908d2b93665/without-text.png)


See merge request !5887

Fix icon alignment of star and fork buttons

## What does this MR do?

Fix alignment of star and fork icons.

## Why was this MR needed?

Buttons had more padding on the left than on the right.

## What are the relevant issue numbers?

fixes #20001 

## Screenshots

<table>
<thead><th>Before</th><th>After</th></thead>
<tr>
  <td><img alt="fork-button-before" src="/uploads/664c0bc935f4c48899f5b63a1c215cbc/fork-button-before.png"></td>
  <td><img alt="fork-button-after" src="/uploads/9385427a5b178487bd24cd2f8ec4a5ed/fork.png"></td>
</tr>
<tr>
  <td><img alt="project-buttons-before" src="/uploads/48ef41458433b468afc2919eb24849cc/project-buttons-before.png"></td>
  <td><img alt="project-buttons-after" src="/uploads/3bafe6e68645d787a2cdb79cd164335f/project-actions.png"></td>
</tr>
</table>

See merge request !5451

Add hover state to todos

## What does this MR do?

- Add a hover state to todos like for repository files.
- Fix button alignment in todos
- Add link to avatar in todos

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

The `border-collapse` part—is there any better way?

## Why was this MR needed?

Make hover states consistent.

## What are the relevant issue numbers?

fixes #19833 

## Screenshots

### Before

![before](/uploads/cd2e7b234bf08fac48aebb60cdfa26a9/before.png)

### After

![todos-list](/uploads/592457050cb3ff2c43dfcce78418c50b/todos-list.png)

![todos-list-last-hover](/uploads/532714333bc74d1656a5c767012b4cdd/todos-list-last-hover.png)

![todos-mobile](/uploads/d542b04ddebc9d4354d57151dd04c0d2/todos-mobile.png)

See merge request !5361

Remove CHANGELOG entries for unmerged !5361 and !5451

## What does this MR do?

See !6189

See merge request !6204

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

lib/backup: fix broken permissions when creating repo dir

## What does this MR do?

This MR fixes an issue where gitlab:backup:restore will not work because the repositories directory is set up with bad permissions. The bad permissions will prevent access to the repositories by the git user, causing all kinds of troubles (e.g. gitlab-shell won't install hooks).

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

## Why was this MR needed?

Rake task gitlab:backup:restore would complete successfully, but gitlab:check will report errors and gitlab cannot access repos.

## Screenshots (if relevant)

* repositories.old.1472478726 was created without the fix
* repositories was created with the fix

![gitlab-repo-permissions](/uploads/6cf2de57fe4f1be0bd5b5e1a13234889/gitlab-repo-permissions.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 [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 !6098

GitHub importer use default project visibility for non-private projects

## What does this MR do?

GitHub importer use the `Default Project Visibility` setting for all non-private projects.

## Why was this MR needed?

This allow users to import projects when `Public` visibility is restricted.

## What are the relevant issue numbers?

Fixes #21437

See merge request !6023

Don't create groups for unallowed users when importing projects

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21457

See merge request !1990

Fix toggler_behavior.js to toggle ajax loaded contents like `diffs` page.

## What does this MR do?

Fix toggle in diffs

## What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21676, https://gitlab.com/gitlab-org/gitlab-ce/issues/21686.

See merge request !6119

Fix sorting issues by "last updated" after import from GitHub

## What does this MR do?

Don't touch Issue/Merge Request when importing GitHub comments as it will trigger an update on `updated_at` field. It also use `updated_at` as the last updated date doesn't matter the Issue/Pull Request state.

## Why was this MR needed?

After import from GitHub, sorting issues by "last updated" doesn't work as expected.

## What are the relevant issue numbers?

Fixes #21567

See merge request !6110

Fixed escaping issue with labels filter

## What does this MR do?

Encodes label names to stop any JS errors.

## What are the relevant issue numbers?

Closes #15552

See merge request !6123

Fix issue boards leak private labels names descriptions

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21167

/cc @stanhu

See merge request !1989

Block concurrent pipeline processings

## What does this MR do?

It's possible that two builds that succeed at the same will try to
concurrently process pipeline. This can lead to scenario when it will
fail to trigger next stages.

This MR makes sure that process of updating is blocking.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21263

See merge request !6090

This reverts commit d836a359.

This reverts commit ff39ccfc.

Remove not-null constraint on lock_version column if it exists

Closes #21678

See merge request !6118

Remove default value for lock_version

From the very beginning we added `lock_version` column with default value, then we reverted that MR. A bit later we added that migration again but column's default value has been removed from migration. So if you installed GitLab form master it's possible that you have default value, which caused  the bug.

We don't need to change a CHANGELOG here I think.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21527 and https://dev.gitlab.org/gitlab/organization/issues/971

See merge request !6111
Conflicts:
	db/schema.rb

Merge branch '21285-new-merge-request-source-and-target-branch-fields-filters-both-source-and-target-list' into 'master'

Fixed issue where filtering one dropdown will filter another on the page

## What does this MR do?

Moved `.option-hidden` to exist only in `SELECTABLE_CLASSES` as `NON_SELECTABLE_CLASSES` is used to re-show previously hidden elements.

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

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #21285.

## Screenshots (if relevant)

![2016-08-24_15.59.16](/uploads/8282bd6507d10de61097956a57bd63cc/2016-08-24_15.59.16.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)
Closes #21285

See merge request !5985

Curved lines at top of pipeline graph

#### What does this MR do?
Adds curved lines to second-child of each column
## Are there points in the code the reviewer needs to double check?

#### Why was this MR needed?
To match the mockup

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

#### Screenshots (if relevant)
![Screen_Shot_2016-08-26_at_9.31.49_AM](/uploads/318d3df4ce909daa0ef8ea8d989211c4/Screen_Shot_2016-08-26_at_9.31.49_AM.png)

See merge request !6033

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

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