Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8488

# Conflicts:
#	app/assets/stylesheets/pages/issuable.scss
#	app/models/ci/pipeline_enums.rb
#	app/models/commit_status_enums.rb
#	app/models/user_callout_enums.rb
#	db/schema.rb
#	doc/administration/uploads.md
#	spec/db/schema_spec.rb

[ci skip]

CE upstream - 2018-11-16 05:21 UTC

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

Improve docs for issues created per month

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

Add information on support for git v2 in docs

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

Update architecture.md to have a component by component overview

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

Add missing `performance` to changelog type doc

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

Validate that foreign keys are indexed and created

Closes #50875

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

Resolve "Allow pipelines to be deleted by project owners"

Closes #41875

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

EE: Validate that foreign keys are created

Closes gitlab-ce#50875

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

Rename diffs store variable

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

Replace weight icon

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

Refactor how a few ActiveRecord enums are defined

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

EE: Refactor how a few ActiveRecord enums are defined

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

Fixed image discussion styling

Closes #54110

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

Add saml_discovery_token unauthenticated access

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

Object storage docs are not relevant to GitLab.com and is in Core

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

Fix object storage tier information

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

Fix punctuation error

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

Merge branch '8145-consider-using-something-other-than-a-strike-for-dismissed-vulnerabilities' into 'master'

Restyling the dismissed vulnerabilities

Closes #8145

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

This will allow us to determine if the existance of
a private group can be revealed to a user

Resolve "Upgrade Helm Tiller Version Used By GitLab Managed Apps"

Closes #49726

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

Merge branch '54011-all-files-named-index-have-their-content-rendered-as-if-they-were-text-files' into 'master'

Resolve "All files named `index.*` have their content rendered as if they were text files"

Closes #54011

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

Use Nokogiri as the ActiveSupport XML backend

Closes #54068

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

- use v-show in place of v-if for dismissed states
- wrap custom class name in quotes
- adds tests for the changes

Add e2e test: auto-assign code owners

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

Add glob for CI changes detection

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