CE upstream - 2018-05-16 03:24 UTC

Closes gitlab-com/infrastructure#3499

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

5943 improve license management tests

Closes #5943

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

# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-05-15 09:46 UTC

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

Fix bug with long strings in issue boards

Closes #43367

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

Fix setting Gitlab metrics content types

Closes gitlab-com/infrastructure#3499

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

Does not rescue from GRPC::DataLoss errors

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

Geo: Fix repo, wiki, and upload replication when renaming a namespace that has subgroups, without hashed storage enabled

Closes #6012

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

Resolve "Add nip.io domain suggestion in the Kubernetes cluster details view"

Closes #45584

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

EE: Display help text below auto devops domain with nip.io domain name (#45561)

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

improve basic details on inspecting NFS mounts

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

This limit is (and already was) different in compare to CE
version, bumping this now to reflect recent change introduced by
gitlab-ce!18735.

add values to OpenID configuration test, not only checking for issuer key

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

Fix link for `query_recorder.rb`

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

fix runner requirements

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

The method "content_type" on a controller does not always return the
correct content type. On the other hand, the method "request_format"
does _and_ immediately returns a Symbol (e.g. :json) instead of a
mime-type name (e.g. application/json). With these changes metrics
should again report their action names correctly.

Fixes https://gitlab.com/gitlab-com/infrastructure/issues/3499

Add a unique and not null constraint on the project_features.project_id column

Closes #37882

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

Simplified priority, performance impact should be severity

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

Update Web IDE documentation with recent changes

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

Remove authentication for readonly endpoints in issues API

Closes #40855

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

fix typos Frontend Guide, development_process.md

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

Resolve "Interact with security reports should be marked as 'alpha' instead of 'experimental'"

Closes #6016

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

Improve fast specs helper to autoload the library

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

It mentions that explicitly defining dependencies in sources is
preferred over defining such dependencies only in spec files.

Merge branch '46361-does-not-log-failed-sign-in-attempts-when-the-database-is-in-read-only-mode' into 'master'

Does not log failed sign-in attempts when the database is in read-only mode

Closes #46361

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

Merge branch '46361-does-not-log-failed-sign-in-attempts-when-the-database-is-in-read-only-mode-ee' into 'master'

Port of 46361-does-not-log-failed-sign-in-attempts-when-the-database-is-in-read-only-mode to EE

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

This commit has two migrations:

1. The first prunes duplicate rows in the project_features table and leaves
   the row with the highest ID.  Since the behavior was indeterministic before
   and depended on which row the database decided to use, this change at least
   makes the permissions consistent. For example, in some cases, the Wiki may
   have been disabled but enabled in another entry.

2. The second adds a non-null constraint on the project_features.project_id
   column.

Closes #37882

Fixes a significant part of gitlab-com/migration#408.

We found that we were overcounting Wikis because of these duplicates.
On GitLab.com, there are 56 rows with duplicate entries by project_id, and 16,661 rows with NULL project_id values.

Add index on ci_runners.runner_type

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

Merge branch '31662-remove-squashed-related-commits-together-from-default-mr-template' into 'master'

Resolve "Remove `Squashed related commits together` from default MR template"

Closes #31662

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