Fix checkbox/radio button structure (EE)

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

Fix snippets embed form (EE)

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

[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

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

Export assigned issues in iCalendar feed

Closes gitlab-ce#44184

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

Merge branch '4957-projectsyncworker-should-skip-projects-that-have-a-broken-gitaly-shard-4' into 'master'

Break out Gitlab::Geo::LogCursor::Daemon

Closes #4957

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

CE upstream - 2018-05-31 09:33 UTC

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

Use strings as properties key in kubernetes service spec.

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

Add /vendor/gitaly-ruby to gitignore

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

Replace .having with .where in calendar query

Closes #46964

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

Replace `.exists` with `EXISTS ()`

Closes #46277

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

Resolve "ee/spec/lib/gitlab/geo/oauth_session_spec.rb test doesn't actually do anything"

Closes #6111

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

Use Gitaly 0.104.0

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

Fix encoding bug in Gitaly::Commit::TreeEntry

Closes #46445 and gitaly#1208

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

# Conflicts:
#	lib/api/api.rb

[ci skip]

Merge branch '45520-remove-links-from-web-ide-unexpectedly-navigate-you-to-a-different-page' into 'master'

Resolve "Remove links from Web IDE unexpectedly navigate you to a different page"

Closes #45520

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

Cleanup code for General Project Settings

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

Cleanup EE specific code for Project settings

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

Adjust permitted params filtering on merge scheduling

Closes #46903

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

Resolve "Unable to start rails console if using master from gitlab-shell"

Closes #46991

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

Fix cattr_accessor definition

Closes #46282

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

Removal of API v3 from the codebase

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

Removal of API v3 from the codebase

Closes #36819

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

Resolve "Extra whitespace when hovering commit sha in MR widget"

Closes #46971

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

Resolve "Revert to use a simpler check for `ee-files-location-check`"

Closes #6243

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

Fix various bugs related to relative_url_root in development

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

Improve structure of snippets documentation

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

CE upstream - 2018-05-31 06:24 UTC

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