fix merge conflict with issue_show haml

.gitignore

.gitlab-ci.yml

CHANGELOG.md

Gemfile.lock

README.md

VERSION

app/assets/javascripts/blob/blob_fork_suggestion.js

app/assets/javascripts/blob/notebook/index.js

app/assets/javascripts/dispatcher.js

app/assets/javascripts/merge_request_tabs.js

app/assets/javascripts/monitoring/prometheus_graph.js

app/assets/javascripts/notebook/cells/code.vue

app/assets/javascripts/notebook/cells/code/index.vue

app/assets/javascripts/notebook/cells/index.js

app/assets/javascripts/notebook/cells/markdown.vue

app/assets/javascripts/notebook/cells/output/html.vue

app/assets/javascripts/notebook/cells/output/image.vue

app/assets/javascripts/notebook/cells/output/index.vue

app/assets/javascripts/notebook/cells/prompt.vue

app/assets/javascripts/notebook/index.vue