Fix widget of locked merge requests not being presented

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

Circuitbreaker stable patch

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

Circuitbreaker backoff and retries

Closes #37383 and #38231

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

Make the circuitbreaker configurable at runtime

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

Use the correct project visibility in system hooks

Closes #39496

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

Avoid using `Redis#keys`

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

grab the correct username when confirming secondary email

Closes #39366

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

Prepare 10.1.1 release

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

* upstream/10-1-stable:
  Update gitaly in Gitlab 10.1 to 0.43.1

Update docs on creating MRs

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

(cherry picked from commit 1aae91cf)

8bb17358 Update docs on creating MRs

Change default disabled merge request widget message to be more general

Closes #39188

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

(cherry picked from commit e9d35261)

b7835587 Change default disabled merge request widget message to "Merge is not allowed yet"

Sanitize k8s default_namespace

Closes #38692

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

(cherry picked from commit 172ebcb8)

a1b3cd40 namespace should be lowercased in kubernetes. This is also true for the scenario…
6798bab1 Remove duped tests
3aafcc16 Add KubernetesService#default_namespace tests

Semi-linear history merge is now available in CE.

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

(cherry picked from commit 284a9452)

be73ede3 Semi-linear history merge is now available in CE.

Add docs for `api_json.log` file

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

(cherry picked from commit 16998e2e)

f452da7c Add docs for `api_json.log` file

Add path attribute to WikiFile class

Closes #39420

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

(cherry picked from commit 98c57e9a)

76becfb5 Add path attribute to WikiFile class

Revert "Merge branch '36670-remove-edit-form' into 'master'"

Closes #39441

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

(cherry picked from commit fa3b4736)

17b43670 Revert "Merge branch '36670-remove-edit-form' into 'master'"

Update gitaly in Gitlab 10.1 to 0.43.1

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

Fix bitbucket login

Closes #39495

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

(cherry picked from commit a1aa4f00)

7d8eb4dd Fix bitbucket login

Don't rename groups/projects that aren't reserved anymore

Closes #39387

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

(cherry picked from commit d27039d1)

a280c687 Don't rename groups/projects that aren't reserved anymore

Fix the writing of invalid environment refs

Closes #39182

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

(cherry picked from commit 3dcdd4a1)

3bff85a4 Fix the writing of invalid environment refs

Fix code review discussion action buttons

Closes #38891

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

(cherry picked from commit a811704c)

d04a2aef Fix icon color and btn-group alignment of discussion buttons

Remove Sherlock usage from the performance bar

Closes #39351

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

(cherry picked from commit 057c81b1)

189b5c3c Remove Sherlock usage from the performance bar

Only cache the push event for the fork-source when it exists

Closes #39352

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

(cherry picked from commit 08a8a3f9)

6f5ebc4b Only cache the event for the fork-source when it exists

Fix deletion of container registry or images returning an error

Closes #39354

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

(cherry picked from commit 4cc91b4f)

3e81c500 Fix deletion of container registry or images returning an error

Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`

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

(cherry picked from commit 815a32e2)

3f59f53b Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
a84fd6a0 Copyedit shared/disposable env variables

[ci skip]

Resolve "Online view of HTML artifacts is broken?"

Closes #39189

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

(cherry picked from commit cfd97f7e)

3c0be3cd Fix the external URLs generated for online view of HTML artifacts

Prevent ApplicationSetting to cache nil value

Closes #39275

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

(cherry picked from commit 81175d2c)

64fd9814 Prevent ApplicationSetting to cache nil value
beeed14f Fix failure in current_settings_spec.rb

Prepare 10.1 RC4 release

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

URI decode Page-Title header to preserve UTF-8 characters

Closes #39179

(cherry-picked from 85c20160)

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

Force non diff resolved discussion to display when collapse toggled

Closes #39187

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

(cherry picked from commit 9c3f094a)

9487cadf Force non diff resolved discussion to display when collapse toggled
1c4f42a4 Add spec
f6304f16 Add changelog

Update Prometheus gem to fix problems with other Processes overwriting current metrics file

Closes #36714

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

(cherry picked from commit f73efb79)

f9a4f184 Update Prometheus gem to fix problems with other files overwriting current file

Fix inability to delete container registry tags

Closes #39260

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

(cherry picked from commit 83f5955e)

b7e35033 Fix inability to delete container registry tags
de57492d Fix broken function invocation

Avoind unnecesary `force_encoding` operations

Closes #39227

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

(cherry picked from commit 371eb62b)

520866a0 Avoind unnecesary `force_encoding` operations

Prepare 10.1 RC3 release

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

Resolve "Jobs fail because of Brazilian Portuguese translations"

Closes #39253

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

(cherry picked from commit 9c71fb0d)

0139b318 Prevent ApplicationHelper specs from polluting later ones