https://gitlab.com/gitlab-org/gitlab-ee/issues/260#note_12001370

Source branch:
https://gitlab.com/gitlab-org/gitlab-test/tree/merged-target

Target branch:
https://gitlab.com/gitlab-org/gitlab-test/tree/improve/awesome

Thanks @DouweM!
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/454#note_12606893

So we just search if the target commit was included in this
merge request from the common ancestors.

* origin: (429 commits)
  UpdateMirror service return an error status when no mirror
  Remove explicit Gitlab::Metrics.action assignments, are already automatic.
  Fix Error 500 when attempting to sort merge requests by weight
  Fix JenkinsService test button
  File Lock
  Show flash notice when Git Hooks are updated successfully
  Set GL_ID in MergeRequests::RebaseService
  Update CHANGELOG
  ES: Project members with guest role can't access confidential issues
  Projects without import_url cannot be mirrors
  update schema
  Make project_id nullable
  update schema
  [Elastic] Move ES settings to application settings
  Update CHANGELOG-EE for 8.8.5 release
  Update CHANGELOG-EE for 8.7.7 release
  Update CHANGELOG-EE for 8.6.9 release
  Update CHANGELOG-EE for 8.5.13 release
  Update CHANGELOG-EE for 8.4.11 release
  Update CHANGELOG-EE for 8.3.10 release
  ...

Remove explicit Gitlab::Metrics.action assignments, are already automatic.

See merge request !473

It's not that it must be rebased, it could also be merged.
This also raises a question: Why we could only rebase on
GitLab, but not merge whenever merge should also be an option?

After this change, we could also not enforce a linear history
because we also allow merging.

Add LDAP EE docs

Add specific documentation for LDAP in EE. I chose to create a new file to reduce the chance of overwrites when CE gets merged to EE. 


See merge request !367

UpdateMirror service return an error status when no mirror

See merge request !482

Fix Error 500 when attempting to sort merge requests by weight

Fixes #673

See merge request !477

Fixes #673

Fix JenkinsService test button

When clicking the "Test" button on the JenkinsCI Service, the following error occurs:

```
We tried to send a request to the provided URL but an error occurred: undefined method `message' for [200, ""]:Array 
```

!374 changed the implementation to call the `WebHook`, which returns [status, message], instead of the return value of `HTTParty#post`.

Closes #637

See merge request !476

File Lock

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/497

- [x] Data layer(tables, models, migrations)
- [x] Checks on git push
- [x] Author should be able to push if one owns the lock
- [x] Path matcher with tokenizer and memoization
- [x] Show lock status icons by files and folders
- [x] UI: mockup buttons for locking files, folders
- [x] UI: Locking files
- [x] UI: Locking folders
- [x] Permissions check everywhere
- [x] Add page to list all locked files/dirs to get overview in case people forget to unlock
- [x] Refactor `lock_file_button` and `lock_file_link`
- [x] Testing Git LFS
- [x] Get rid of code duplication in pre-receive hook
- [x] Test case: I want to unlock file if I'm a developer and I'm not an author of lock
- [x] Make it EE option
- [x] Specs and spinach
- [x] TODOs in the code

Can be moved to the next iteration:
- [ ] Duplicate lock checks in the service since pre-receive hook does not work for UI (according to Douwe)
- [ ] timeago in the lock icon tooltip. It's not working out of the box.
- [ ] Ajax load bar on click "Lock/Unlock" in the file tree
- [ ] Nested locking UI. If we look at file and it's locked because of parent we should show it in tooltip. 


**Screenshots**

![joxi_screenshot_1466188707474](/uploads/623e65c9a246b07c9786fd8babdb2dd8/joxi_screenshot_1466188707474.png)![joxi_screenshot_1466188735083](/uploads/4588eff352ee544de5bb5727d501a2cc/joxi_screenshot_1466188735083.png)![joxi_screenshot_1466188758950](/uploads/dee7b342c7825a79ed1629535eced5ed/joxi_screenshot_1466188758950.png)


Related info:
Douwe wrote:
```For a next iteration, we need to think about nested locking more. If user A has locked lib/, user B shouldn't be able to lock lib/foo.rb since that falls under lib/. Similarly, if user A has locked lib/foo.rb, user B shouldn't be able to lock lib/, because part of that directory is locked by someone else already.```

See merge request !440

Closes #637

Show flash notice when Git Hooks are updated successfully

Fixes #320

See merge request !475

Set GL_ID in MergeRequests::RebaseService

We missed this in 6280bcc0 I think.

See merge request !472

ES: Project members with guest role can't access confidential issues

## What does this MR do?

Restrict access to confidential issues to team members with at least Reporter access when performing search using Elasticsearch.

Allow users to create confidential issues in private projects, and exclude access to them to project members with `Guest` role.

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

The query generated in the `Elastic::NotesSearch.elastic_search` method.

## Why was this MR needed?

Confidential issues should only be visible to team members with at least Reporter access.

## What are the relevant issue numbers?

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

## Screenshots (if relevant)

Not relevant.

See merge request !471

MergeRequest#commits.last is actually first_commit

Using a method would be less confusing.

This was discovered in the process of figuring out https://gitlab.com/gitlab-org/gitlab-ee/issues/260

/cc @DouweM 

See merge request !453

Projects without import_url cannot be mirrors

See merge request !463

Update schema (and CE upstream with the fix)



See merge request !469

Make project_id nullable

## What does this MR do?
Fixes the broken migration which is not in sync with `db/schema.rb`.

It's to solve https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/469.


See merge request !4701

ES settings in the ApplicationSetting



See merge request !359

Update migration_style_guide.md with new details

See merge request !4693