# Conflicts:
#	app/models/user.rb

Update GitLab Shell to v8.4.0 for new Gitaly auth scheme

Closes gitaly#1319

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

QA: Add test of adding a member to a project

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

Documentation for delayed jobs

Closes #52127

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

Add Filesystem Performance Benchmarking documentation

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

Revert GitLab Pages version to v1.1.0

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

This works around the problem with domains not working
due to gitlab-org/gitlab-pages#170.

Adds a new QA test and the required page objects and related changes

Filesystem performance can have a big impact on overall GitLab
performance, especially for actions that read or write Git
repositories. This information will help benchmark filesystem
performance against known good and bad real-world systems.

Prettify all the things (part 5)

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

Prettify all the things (part 2)

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

Merge branch '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-11-4-0-rc' into 'master'

Resolve "Dropzone css is failing to load on rspec, dev and staging 11.4.0 RC"

Closes #52103

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

Convert remaining issue board components into ES module syntax

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

QA: Retry registration before failing

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

[QA] Fix a wrong constant name

Closes gitlab-org/quality/nightly#22

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

Add allowance to merge feature flags MRs

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

Add `TOP_UPSTREAM_SOURCE_SHA` in `scripts/trigger-build`

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

Enhance and test JSON schema for deployments

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

Registration intermittently fails without an obvious cause.
The action to click the button seems to move focus to the right button
but nothing happens.
This change attempts to retry the action under the assumption that
Capybara or Chrome is misbehaving.
It also updates the selectors for the sign up page.

Fix broken link and file improvements

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

After the 7th it is OK to merge code changes that are merged as long it
is behind a feature flag.

Add in review specifics

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

The Menu namespace was changed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22115 and
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7799.

Fixes https://gitlab.com/gitlab-org/quality/nightly/issues/22

.

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

Remove Git circuit breaker

Closes #45405

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

Backport of CE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7844

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

Make the variable names consistent by following the
`TOP_UPSTREAM_SOURCE_*` pattern.

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

This is needed because `GITLAB_VERSION` has a special meaning in
`omnibus-gitlab` triggers: this is the GitLab version to build.

The problem is that `omnibus-gitlab` also has triggers to run QA for an
`omnibus-gitlab` commit, and if we use `GITLAB_VERSION` in that case,
the comment would be posted on the GitLab CE/EE commit (stored in
`GITLAB_VERSION`), whci hwouldn't make any sense.
Thus we need `TOP_UPSTREAM_SOURCE_SHA` to represent the commit on
which we want to leave a comment.

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

Clarify what happens when enabling a service template

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

Update the HA NFS docs

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

Move the Auto DevOps note to the top

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

Add test of adding file templates via Web IDE and Files view

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