Fix conflict in app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue

Fix encoding of branch names on compare and new merge request page

Closes #46627

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

Upgrade to Bootstrap 4

Closes #45185 and #46710

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

Upgrade to Bootstrap 4 (EE)

Closes #5767

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

CE upstream - 2018-05-25 18:23 UTC

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

Merge branch '46740-projectmilestones-setting-start_date-via-the-api-requires-a-second-parameter' into 'master'

Resolve "ProjectMilestones: Setting start_date via the API requires a second parameter"

Closes #46740

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

CE upstream - 2018-05-25 15:30 UTC

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

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

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

# Conflicts:
#	README.md
#	app/views/help/index.html.haml

[ci skip]

Authentiq gem update

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

CE upstream - 2018-05-25 12:30 UTC

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

Remove Gemnasium badge from project's README.md

Closes #45404

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

Remove dead link to Google Drive

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

Bring CE-EE parity to app/services/projects/destroy_service.rb

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

Resolve "gitlab 10.8 assumes that installation is a git working copy."

Closes #46600

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

Init documentation for embedded snippets

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

Add embedded snippets docs ee

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

[EE] Replace Gitlab::REVISION with Gitlab.revision and handle installations…

Closes gitlab-ce#46600

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

# Conflicts:
#	spec/javascripts/api_spec.js

[ci skip]

Resolve "Typo on the empty Pipelines page"

Closes #46768

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

CE upstream - 2018-05-25 09:26 UTC

Closes charts/gitlab#390

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

Resolve "Show CI pipeline status in Web IDE"

Closes #44579

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