# Conflicts:
#	app/controllers/profiles_controller.rb
#	app/controllers/projects/issues_controller.rb
#	app/views/projects/issues/_nav_btns.html.haml
#	app/views/shared/issuable/form/_merge_params.html.haml
#	config/routes/project.rb
#	db/schema.rb
#	locale/gitlab.pot
#	spec/controllers/application_controller_spec.rb

[ci skip]

Update 404 and 403 pages

Closes #25955

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

Fix bootstrap squash checkbox alignment

Closes #47055

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

Fix bootstrap pipeline right alignment

Closes #46875

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

Resolve "Admin area > New Application form"

Closes #46817

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

Fix checkbox/radio button structure (EE)

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

Remove form-horizontal class where applicable

Closes #46744

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

Fix checkbox/radio button structure

Closes #46766 and #46719

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

Fix snippets embed form (EE)

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

Fix snippets embed form

Closes #46948

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

Make ActiveRecordSubscriber rails 5 compatible

Closes #44702

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

[CE port] Take two for MR metrics population background migration

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

CE upstream - 2018-05-31 12:26 UTC

Closes gitaly#1208

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

Add merge requests list endpoint for groups

Closes #45082

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

Fixes redudant script failure message

Closes #46552 and #44271

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

Display pipeline and author of dismissal in vulnerability modal

Closes #5953

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

Conflicts:
   lib/gitlab/import_export/relation_factory.rb

Take two for MR metrics population background migration

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

Add yarn clean step, to delete production compiled assets

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

Fix active tab styling

Closes #46799

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

Add link to hack for styling Capybara HTML dumps

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