- Required on the GitLab Rails side is mostly authentication and API related.

Improve validity of spec/features/todos/todos_filtering_spec.rb

Previously, we were checking that a CSS selector string didn't have some
page-related content, which, of course it didn't.

Now we check against the actual content of the selector, we use a more
semantic selector, and we add an additional expectation for the text
that _should_ be there, as an additional sanity check.

See merge request !6356

Update references to deprecated `repos_path` configuration key to avoid

## What does this MR do?

Update references to deprecated `repos_path` configuration key to avoid errors when updating GitLab from older versions

## Why was this MR needed?

Users were reporting errors when upgrading from GitLab 6.7

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1464

See merge request !6350

Group similar builds

We group builds by removing from the builds name two numbers which are delimited by whitespace or colon:
* `name 0 1` => `name`
* `name 0:1` => `name`
* `name 0/1` => `name`
* `name 0:1 ruby` => `name ruby`
* `name 0/1 ruby` => `name ruby`
* `0 1 name ruby` => `name ruby`
* `0:1 name ruby` => `name ruby`
* `0/1 name ruby` => `name ruby`

See merge request !6242

Trigger autosize update after template selection

## What does this MR do?

Triggers an autosize update after selecting an issue template.

The autosize plugin doesn't react to value changes and therefore doesn't automatically update when the user selects the template. This merge request adds it so that it detects if the editor the template selector is a jQuery object (not Ace editor) & then triggers the autosize event to allow the user to scroll the textarea.

## Screenshots (if relevant)

![resize](/uploads/1ab04b4202309b13f1178e04c0953112/resize.gif)

## What are the relevant issue numbers?

Closes #21982

See merge request !6282

doc/ci/quick_start/README: improve sentence about link to a Lint tool

## What does this MR do?

It improves the `doc/ci/quick_start/README.md` documentation.

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

The reviewer can check that there is no more **CI settings** menu and that the Lint tool can be accessed under **Pipelines > Pipelines** and **Pipelines > Builds**.

## Why was this MR needed?

Because the CI quick start documentation was not correct.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

It is not a code change so I don't think the below criteria are relevant.

- [ ] [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 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?

I didn't check if there was an issue for this.

See merge request !6301

doc/user/permissions: update option and menu names

## What does this MR do?

This fixes `doc/user/permissions.md` documentation.

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

The reviewer can check that the name of the option is now **Public pipelines** and that this option is in **Project Settings > CI/CD Pipelines**.

## Why was this MR needed?

Because the previous name of the option and of the menu had not been updated in `doc/user/permissions.md` when they were changed.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

This is a documentation only MR, so I don't think it needs to pass all these 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 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?

I don't know of any issue number.

See merge request !6302

Fixed add to tree button on mobile

## What does this MR do?

Fixes an issue with the width of the add to tree button on mobile.

This was caused by acde2e30 adding `100%` width for mobile.

## Screenshots (if relevant)

![Screen_Shot_2016-09-14_at_10.52.41](/uploads/029877794411ef68f31091869b7b9618/Screen_Shot_2016-09-14_at_10.52.41.png)

## What are the relevant issue numbers?

Closes #22128

See merge request !6339

Fix the ordering of transition callbacks

Because pipeline status could be changed for the builds in the next
stages, if we process next stages first, the current build would be
out of synchronized, and would need a reload for that matter.

Alternatively, like what I did in this commit, we could process the
next stages later (by using `after_transition` rather than
`around_transition`), and complete what're doing for the current
build first. This way we don't have to reload because nothing is
out synchronized.

Note that since giving `false` in `after_transition` would halt the
callbacks chain, according to:

https://github.com/state-machines/state_machines-activemodel/blob/v0.4.0/lib/state_machines/integrations/active_model.rb#L426-L429

We'll need to make sure we're not returning false because we don't
intend to interrupt the chain.

This fixes #22010.

After this fix, both pipeline events and build events would only show
up once.

See merge request !6305

Simplify the 'Implement design & UI elements' section in CONTRIBUTING

There's a nice documentation page in the gitlab-design page, so just link to it!

See merge request !6249

Clean environment variables when running git hooks

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

See merge request !6344

Bump rubocop to 0.42.0

Also updates `.rubocop_todo.yml` for the latest cops.

See merge request !6354

Allow flay and flog to fail for now

flay and flog started working somehow (despite #17858). Disabling them for now since the broken builds are impeding progress.

See merge request !6360

Ignore SVG whitelist code from flay

The SVG whitelist code was generated from table definitions, and simplifying it would actually make it harder to read.

See merge request !6361

errors on updates from older versions

Previously, we were checking that a CSS selector string didn't have some
page-related content, which, of course it didn't.

Now we check against the actual content of the selector, we use a more
semantic selector, and we add an additional expectation for the text
that _should_ be there, as an additional sanity check.

Fix wiki headeline linking

Fixes #21817

See merge request !6300

[ci skip]
Signed-off-by: Rémy Coutable <remy@rymai.me>

[ci skip]
Signed-off-by: Rémy Coutable <remy@rymai.me>

This MR fixes the migration that removes the unique index/constraint from `merge_request_diffs.merge_request_id`

See merge request !6346

For whatever reason on some PostgreSQL installations there would be a
separate UNIQUE constraint on the merge_request_id column. Rails'
index_exists?() returns false for this constraint (even when using the
full name), yet the indexes() method returns it.

This commit changes the migration so that the constraint is dropped as
well. MySQL installations don't appear to be affected.

Fixes gitlab-org/gitlab-ce#22136

Update gitlab_git to 10.6.6

## What does this MR do?

This updates gitlab_git to version 10.6.6

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

No.

## Why was this MR needed?

10.6.4/10.6.5/10.6.6 contains some changes regarding marking blobs as binary, this can improve page loading times.

## Does this MR meet the acceptance criteria?

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

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

See merge request !6279

Back-port from EE. This MR just moves the `parse_search_results` method from models/repository.rb to search_helper.rb

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/699

See merge request !6341

Add specs for removing project

## What does this MR do?
Added more tests to removing project.

## 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] 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 #5874 

cc: @kradydal @yorickpeterse @grzesiek 

See merge request !6240

Update omniauth-facebook to '~>4.0.0'

## What does this MR do?
Update omniauth-facebook to '~>4.0.0'

## What are the relevant issue numbers?

Closes #21748 

cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin

See merge request !6321

Document the fact that merge requests from forks can be checked out locally

As pointed out by @JobV, our documentation doesn't clearly state that you can checkout a merge request from a fork locally.

See merge request !6324

gitlab_git 10.6.4 relies on Rugged marking blobs as binary or not,
instead of relying on Linguist. Linguist in turn would mark text blobs
as binary whenever they would contain byte sequences that could not be
encoded using UTF-8.

However, marking such blobs as binary is not correct. If one pushes a
Markdown document with invalid character sequences it's still a text
based Markdown document and not some random binary blob.

This commit overwrites Blob#data so it automatically converts text-based
content to UTF-8 (the encoding we use everywhere else) while taking care
of replacing any invalid sequences with the UTF-8 replacement character.
The data of binary blobs is left as-is.