# Conflicts:
#	doc/user/project/issues/create_new_issue.md

[ci skip]

QA: Allow the registration e2e test to be skipped

See merge request gitlab-org/gitlab-ce!22205

Geo: Disable backoff for file attachment types

See merge request gitlab-org/gitlab-ee!7826

Bump rugged to 0.27.5 for security fixes

See merge request gitlab-org/gitlab-ce!22208

Don't backoff for uploads, LFS objects or CI job artifacts

Use project-level license check for Batch Comments

See merge request gitlab-org/gitlab-ee!7838

See: https://github.com/libgit2/libgit2/releases

Move Issue#related_issues method to EE scope

Closes #7906

See merge request gitlab-org/gitlab-ee!7836

Merge branch '52353-keyboard-navigation-project-slug-is-not-focused-on-new-project-page' into 'master'

Resolve "Keyboard navigation: "Project slug" is not focused on "New project" page"

Closes #52353

See merge request gitlab-org/gitlab-ce!22198

Instead of using instance-level. Prevents projects
in GitLab.com that don't have EEP level from showing
the EEP feature.

This is an EE only method. So ideally we should
move to EE scope to avoid conflicts on CE -> EE.

If SIGNUP_DISABLED is true skip any tests with a context
:skip_signup_disabled. The context is set for the registration tests.
This allows the tests to be skipped when run on the staging, which
doesn't allow registration

Removes expensive dead code on main MR page request

Closes #51172

See merge request gitlab-org/gitlab-ce!22153

Group-level Security Dashboard – Counts/Overview

See merge request gitlab-org/gitlab-ee!7564

Add review app to gitlab-ce

See merge request gitlab-org/gitlab-ee!7804

- Improves the vulnerabilities store to accomodate the counts
- Adds Components for the vulnerability counts
- Adds extra actions, getters, and methods for the counts
- Adds skeletal loading to the vulnerabilities tablet
- Adds integration tests for the components that use stores

Remove duplicate button from the markdown header toolbar

See merge request gitlab-org/gitlab-ce!22192

Resolve "Pipeline graph is not vertically aligned in commit page"

Closes #52193

See merge request gitlab-org/gitlab-ce!22173

Fix comments in app/models/note.rb

See merge request gitlab-org/gitlab-ce!22171

Update installation and update docs for 11 4

See merge request gitlab-org/gitlab-ce!22030

Clean up ActiveRecord code in TodosFinder and TodoService

See merge request gitlab-org/gitlab-ce!21838

Add note in docs for docker executor for interactive web terminal

See merge request gitlab-org/gitlab-ce!21880

Fix links to auth resources external to docs

See merge request gitlab-org/gitlab-ce!22180

CE upstream - 2018-10-08 09:21 UTC

See merge request gitlab-org/gitlab-ee!7833

* Use 2 space indentation in review-apps.sh script
* Move automated_review_cleanup back to build stage

This refactors the TodoService class according to our code reuse
guidelines. The resulting code is a wee bit more verbose, but it allows
us to decouple the column names from the input, resulting in fewer
changes being necessary when we change the schema.

One particular noteworthy line in TodoService is the following:

    todos_ids = todos.update_state(state)

Technically this is a violation of the guidelines, because
`update_state` is a class method, which services are not supposed to use
(safe for a few allowed ones). I decided to keep this, since there is no
alternative. `update_state` doesn't produce a relation so it doesn't
belong in a Finder, and we can't move it to another Service either. As
such I opted to just use the method directly.

Cases like this may happen more frequently, at which point we should
update our documentation with some sort of recommendation. For now, I
want to refrain from doing so until we have a few more examples.

This refactors the TodosFinder finder according to the new code reuse
rules, as enforced by the CodeReuse cops. I also changed some of the
methods to use regular if statements, instead of assignments and/or
early returns. This results in a more natural flow when reading the
code, and it makes it harder to accidentally return the wrong result.

docs: cleanup term settings wording

See merge request gitlab-org/gitlab-ce!22162

Replace old "secret variables" image for variables with new "variables" image

See merge request gitlab-org/gitlab-ce!22184

Docs - Prefilled fields for new issue link

See merge request gitlab-org/gitlab-ee!7796

Redirect to the pipeline builds page when a build is canceled

Closes #39161

See merge request gitlab-org/gitlab-ce!21595

Resolve "Merge request buttons spacing incorrect"

Closes #48494

See merge request gitlab-org/gitlab-ce!22135

Docs - Prefilled fields for new issue link

See merge request gitlab-org/gitlab-ce!22082