[ci skip]

Remove order-dependent expectation

Fixes #24341, hopefully

See merge request !7385

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

Add more highlighting to development docs

Now that docs.gitlab.com has lovely highlighting, we should make sure we use it
everywhere it makes sense!

See merge request !7369

Add query param to filter users by 'external' & 'blocked' type on API

Closes #23731

See merge request !7109

[ci skip]

Add a link to Git cheatsheet PDF in docs readme

See merge request !7382

[ci skip]

Change auto selection behaviour of emoji and slash commands to be more UX/Type friendly

## What does this MR do?
In the context of a special command (starting with "/", ":", ...), the MR disables auto selection of first item in the dropdown suggestion menu, until at least a character has been typed.
This behavior change originated from #22058 and #23578 in which problems with the ":" special command were pointed out.

## Are there points in the code the reviewer needs to double check?
At lines +187 and +242 there were originally no sorters. Given what ``DefaultOptions.sorter`` does, I don't think it is a problem.

## Why was this MR needed?
To solve #22058 and #23578 

## Does this MR meet the acceptance criteria?

- [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
  - [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 it does - 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 #22058 and #23578 

See merge request !7129

Improve ldap:check errors

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

See merge request !6601

Remove an extra leading space from diff paste data

## What does this MR do?

Remove an extra leading space from diff paste data.

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

I have checked the following three patterns.

* inline diff
* parallel diff
* blob preview

## Why was this MR needed?

Diff paste data contain an extra leading space.
So it need to remove an extra leading space manually from pasted diff data.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 it does - 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?

#14176

Closes #23899

See merge request !7133

Integrate CI emails into notification system

Closes #21930

See merge request !6342

[ci skip]

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

Restore unauthenticated access to public container registries

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



See merge request !2025

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

Respect project visibility settings in the contributions calendar

This MR fixes a number of bugs relating to access controls and date selection of events for the contributions calendar

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



See merge request !2019

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

Ensure external users are not able to clone disabled repositories.

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



See merge request !2017

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

Fix for HackerOne XSS vulnerability in markdown

This is an updated blacklist patch to fix https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2007. No text is removed. Dangerous schemes/protocols and invalid URIs are left intact but not linked.

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



See merge request !2015

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

disable markdown in comments when referencing disabled features

fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23548



This MR prevents the following references when tool is disabled:

- issues
- snippets
- commits - when repo is disabled
- commit range - when repo is disabled
- milestones

This MR does not prevent references to repository files, since they are just markdown links and don't leak
information.

See merge request !2011

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

Honour issue and merge request visibility in their respective finders

This MR fixes a security issue with the IssuesFinder and MergeRequestFinder where they would return items the user did not have permission to see. This was most visible on the issue and merge requests page for a group containing projects that had set their issues or merge requests to "private".

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

See merge request !2000

[ci skip]

[ci skip]

[ci skip]

24146 Add focus state to buttons and dropdowns

## What does this MR do?
Adds focus state to buttons and dropdowns

## Are there points in the code the reviewer needs to double check?
All focus states of buttons and dropdowns :)

## Why was this MR needed?
Improve accessibility

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-11-07_at_4.30.31_PM](/uploads/8db2ac5e225c78495797180faf7bdb28/Screen_Shot_2016-11-07_at_4.30.31_PM.png)
After:
![Screen_Shot_2016-11-07_at_4.30.16_PM](/uploads/4a81810cafe3063eef02b7bc87f8ce69/Screen_Shot_2016-11-07_at_4.30.16_PM.png)

## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 #24146

See merge request !7347

Bring back the old JIRA docs

## What does this MR do?

Bring back the old JIRA docs

## Why was this MR needed?

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6598 introduced new
JIRA settings, but that's not yet released. Since our documentation is currently
built using the master branch, users are having issues where the docs show
different settings than what GitLab's latest stable release supports.

## What are the relevant issue numbers?

https://gitlab.zendesk.com/agent/tickets/48003

See merge request !7365

It was previously possible for invalid credential errors to go unnoticed
in this task. Users would believe everything was configured correctly and
then sign in would fail with 'invalid credentials'. This adds a specific
bind check, plus catches errors connecting to the server. Also, specs :)

Improved build page scroll UX

## What does this MR do?

This MR smoothes the UX of the builds page by more effectively affixing the scroll step buttons.

It also ensures the scroll step buttons are always in view, even if the sidemenu is open.

It also moves the autoscroll button into the same container as the scroll buttons.

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

## Why was this MR needed?

The build scroll buttons are always in unpredictable places and are often hidden behind sidemenus.

## Screenshots (if relevant)

![2016-09-08_17.43.58](/uploads/49cb9ad5ef2764453afaa405af7111b2/2016-09-08_17.43.58.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
- [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?

Contributes #21832

See merge request !6270

https://gitlab.zendesk.com/agent/tickets/48003

[ci skip]

Replace jQuery.timeago with timeago.js

## What does this MR do?
Replaces jQuery.timeago with [timeago.js](https://github.com/hustcc/timeago.js)

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

*  Check to make sure its working everywhere  
*  Check to make sure the timeago wording matches what we have now (I think I've got this down but an extra pair of  would help too)

## Why was this MR needed?

*  The jQuery.timeago version we have is outdated
*  timeago.js is smaller (7.19 KB => 4.52 KB)
* timeago.js has no jQuery dependency
* removes all inline javascript   for timeago

## Screenshots (if relevant)
None

## 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 [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 #21793

See merge request !6274

Document the usage of the Docker OverlayFS driver

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

See merge request !7361

Apply `*_params_ce` pattern to ProjectsController

See merge request !7338

Clicking "force remove source branch" label now toggles the checkbox again

We remove the ID from the hidden tag for `merge_request[force_remove_source_branch]`
in order to fix the checkbox toggling when the associated label is clicked.

The issue was introduced by !7267 and discovered in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7267#note_18028311.

See merge request !7356

[ci skip]

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_17981421

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_17981448

* upstream/master: (70 commits)
  Fix routing spec for group controller
  Add small improvements to constrainers and specs
  Faster search
  Fix broken commits search
  Changed helper method to check for none on params Moved if statements around in view
  API: Return 400 when creating a systemhook fails
  Update non-exist group spinach test to match routing
  Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2
  Replace trigger with the new ID of the docs project
  Refactor method name
  17492 Update link color for more accessible contrast
  Fixed todos empty state when filtering
  Refactor namespace regex
  implements reset incoming email token on issues modal and account page, reactivates all tests and writes more tests for it
  Use separate email-friendly token for incoming email and let incoming email token be reset
  Use the Gitlab Workhorse HTTP header in the admin dashboard
  Refactor project routing
  Fix 404 when visit /projects page
  Rewritten spinach git_blame tests to rspec feature tests
  Add tests for project#index routing
  ...