Resolve conflicts in app/views/shared/boards/_show.html.haml and app/views/shared/boards/components/_board.html.haml
Signed-off-by: Rémy Coutable <remy@rymai.me>

# Conflicts:
#	app/views/shared/boards/_show.html.haml
#	app/views/shared/boards/components/_board.html.haml

[ci skip]

Move some EE only helper methods to EE modules

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

Resolve "Fixed vulnerabilities should not be actionable in the report"

Closes #6017

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

Css fix for search dropdown overflow issue.

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

i18n: externalize strings from 'app/views/shared/boards'

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

CE upstream - 2018-06-26 00:21 UTC

Closes #6591, gitaly#944, gitaly#789, gitaly#308, gitaly#879, and gitaly#310

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

Add Hiroyuki Sato as a Japanese proofreader

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

Set flash error message only for current request when updating project

Closes #43772

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

Rails5 fix  expected: ({...}) got: (<ActionController::Parameters {...})

Closes #6606

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

Rails5 fix NoMethodError: undefined method `join' for "":String

Closes #6607

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

Rails5 fix ArgumentError: wrong number of arguments (given 1, expected 2)

Closes #6608

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

Update CONTRIBUTING.md to fix links

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

# Conflicts:
#	.gitignore
#	app/assets/javascripts/boards/components/board_sidebar.js
#	app/assets/javascripts/boards/components/sidebar/remove_issue.vue
#	app/workers/all_queues.yml
#	config/sidekiq_queues.yml
#	doc/integration/saml.md
#	spec/models/merge_request_spec.rb

[ci skip]

Add back copy for existing gcp accounts within offer banner

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

Merge branch '48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in' into 'master'

Resolve "Sorting by name on explore projects page renders a 500 error when logged in"

Closes #48339

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

Improve shelling out in bin/changelog

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

Fix alert button styling so that they don't show up white

Closes #48407

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

Exclude Geo DB Yaml on CE too

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

Resolve "100% CPU for webpack-dev-server running in GDK"

Closes #33886

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

Unify spec/requests/api/boards_spec.rb

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

Adds method to move tables to CSV with redacted data.

Closes meltano/meltano#80

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

Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE"

Closes #46202

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

Move back app/serializers/deploy_keys_project_entity.rb

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