# Conflicts:
#	app/assets/javascripts/members.js
#	app/assets/javascripts/project.js
#	app/assets/stylesheets/framework/blank.scss
#	app/assets/stylesheets/framework/mixins.scss
#	app/models/merge_request.rb
#	app/views/dashboard/projects/_zero_authorized_projects.html.haml
#	app/views/shared/milestones/_sidebar.html.haml
#	config/prometheus/additional_metrics.yml
#	spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
#	spec/lib/gitlab/checks/change_access_spec.rb

[ci skip]

fix typo

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

Specify which password should be used on Pgbouncer

Closes gitlab-org/build/team-tasks#37

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

Prefer polymorphism over specific type checks in Import service

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

It was a little unclear which password we should specify; it turns out
it's the pgbouncer password, which is used by consul to signal to the
pgbouncer service it should reload.

https://gitlab.com/gitlab-org/build/team-tasks/issues/37

Fix docs to label file locking as EEP-only

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

Introduce default usernames earlier

Closes gitlab-org/build/team-tasks#34

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

Update the sample `consul members`

Closes gitlab-org/build/team-tasks#35

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

`CONSUL_USERNAME` and `PGBOUNCER_USERNAME` are used to derive
`CONSUL_PASSWORD_HASH` and `PGBOUNCER_PASSWORD_HASH`, so we should let
the user know their default values so we're not expecting them to jump
forward to the notes on the service.

https://gitlab.com/gitlab-org/build/team-tasks/issues/34

Update gitlab-workhorse to v3.3.1

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

CE Upstream - Monday

Closes gitlab-qa#99, gitaly#681, gitlab-qa#88 et gitlab-ce#31811

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

Upon reaching this step in the documentation we should have added 7
nodes to the consul environment; 3 servers, 4 clients, so update the
output to reflect that.

Additionally 10.1.2 uses the name `gitlab_consul` for its DC, so bring
that into line.

https://gitlab.com/gitlab-org/build/team-tasks/issues/35

Remove approvals when in empty MR widget state

Closes gitlab-ce#39009

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

Raise the QA Capybara's default wait time from 4 to 10

Closes gitlab-qa#103

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

Add simple logging to UpdateMergeRequestsWorker#perform

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

Remove approvals when in empty MR widget state -- CE backport

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

Merge branch '33338-internationalization-support-for-prometheus-service-configuration' into 'master'

Resolve "Internationalization support for Prometheus Service Configuration"

Closes #33338

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

Ide lock files

Closes #3918

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

this test should be only testing for code that is in the
described_class, not on another job that run afterward.

I also think that the coverage of this task is sufficient with
the CreateForkNetworkMembershipsRange tests.

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39009

Replace 'charts' with 'chart'

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

Update licensing docs to clarify process for node modules

Closes #38007

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

40161 Remove extra margin from wordmark in header

Closes #40161

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

add related issues component to Epic

Closes #3551

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

skip_gitaly_mock disables Gitaly in specs

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

Auto DevOps' gitlab-ci.yml expects a directory named 'chart'.

See also: https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/114

* origin/fix-populate-for-networks-range-spec:
  removed the dependency on another background job running inline