# Conflicts:
#   app/assets/javascripts/issue_show/components/app.vue

Add recaptcha_check_if_spammable for issualbes than arent spammables

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

Todo count calculations now expired quicker for top bar stats

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

Turn" push a file" into a scenario

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

Fix image view mode

Closes #40945

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

Convert Compare and CompareAutocomplete classes into ES module syntax

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

Fix gitlab:import:repos Rake task moving repositories into the wrong location

Closes #40765

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

If the source import directory were different from the destination directory,
GitLab would first create a blank repository and then erroneously move the
original one into a subdirectory. Adding an import type prevents this the project
from being initialized in the first place. It was accidentally removed in
1f917cbd49.

Closes #40765

Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"

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

Allow git pull/push on project redirects

Closes #35385

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

Resolve "Deploy markers should be more verbose"

Closes #38032

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

Resolve "Include asset_sync gem"

Closes #40031

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

Fix N+1 query when displaying events

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

Use prefix for TableOfContents filter hrefs

Closes #38473

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

Fix invalid pipeline build chain tag evaluation

Closes #40944

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

assigned_open_merge_requests_count and assigned_open_issues_count, which are used in the top header stats.  Also important for a Geo secondary, so that the pending todo stat gets updated on the same frequency as the users open issues/merge requests.

TableOfContents filter generates hrefs for each header in markdown,
if the header text consists from digits and redacted symbols only,
e.g. "123" or "1.0 then the auto-generated href has the same format
as issue references.

If the generated id contains only digits, then 'anchor-' prefix is
prepended to the id.

Closes #38473

Merge branch '29483-no-feedback-when-checking-on-checklist-if-potential-spam-was-detected' into 'master'

Resolve "No feedback when checking on checklist if potential spam was detected"

Closes #29483

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

When displaying events we would load the target of those events, then
render the entire data using our Markdown pipeline. This pipeline would
eventually request the author of every target, leading to an additional
query being executed for every target to get the author.

To fix this we now eager load the author of the event's target. In my
local environment this reduces the number of queries to display a
project's Atom feed from 40 to 24 queries.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878 for more
information.

Add docs explaining why you get signed out with "Remember me" checked

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

See https://gitlab.slack.com/archives/C101F3796/p1512486640000434

Check NFS mounts in a separate process

Closes #39847

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