CE upstream - 2018-09-10 21:21 UTC

Closes gitlab-ce#50003 and #7471

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

EE-Port of: gitlab-ce!21593

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

Synchronize the default branch when updating a remote mirror

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

[CE] Make spec/lib/gitlab/import_export/all_models.yml EE-ready

Closes gitlab-ee#7471

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

Bump KaTeX version to 0.9.0

Closes #51065

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

CE upstream - 2018-09-10 15:21 UTC

Closes omnibus-gitlab#2334

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

Remove text about whitelisting from container scanning

Closes #7017

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

Reset column information before running CommonMetricsImporter

Closes #51305

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

Extract the EE-specific models/attributes from spec/lib/gitlab/import_export/all_models.yml to a new file

Closes #7471

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

Enforce good commit messages using Danger

Closes #50003

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

Fix vertical alignment of text in diffs

Closes #48902

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

Closes #51065

This makes sure that newly created columns would be available when
migrating in one go.

Bump Sidekiq 5.1.3 to 5.2.1

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

# Conflicts:
#	doc/api/jobs.md
#	doc/user/project/quick_actions.md
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]

CE upstream - 2018-09-10 10:57 UTC

Closes gitlab-ce#51295

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

Update pseudo file

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

Bump gitlab-shell to 8.3.1

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

docs: Correct YAML indentation

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

8.3.0 was tagged with the commit before the CHANGELOG.md and
version.rb bump, so this just fixes a harmless warning.

Add `duration` attributes to Jobs API docs

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

Add changelog to !21371

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

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

Add /lock and /unlock quick actions

Closes #39173

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

Port of `/lock` and `/unlock` quick actions to EE

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

This port https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7254 to
CE.
Signed-off-by: Rémy Coutable <remy@rymai.me>

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

This Dangerfile ensures that commit authors write good commit messages.
We also prevent the use of Emoji, since these add no value and may not
always be displayed properly.

Merge commits are currently ignored. In the future we most likely want
to stop using these, but this is a separate discussion, hence we ignore
them for the time being.

The rules enforced by this Dangerfile are based on the article found at
https://chris.beams.io/posts/git-commit/. For more information, refer to
https://gitlab.com/gitlab-org/gitlab-ce/issues/50003.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/50003

Replace one word in todos.md

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

Update doc: url reference to grafana

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

Clean up chart index page

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

Clean up chart index page

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