resolve conflict

.gitlab-ci.yml

.gitlab/issue_templates/Bug.md

.gitlab/issue_templates/Feature Proposal.md

.rubocop.yml

CHANGELOG.md

GITALY_SERVER_VERSION

GITLAB_PAGES_VERSION

GITLAB_SHELL_VERSION

Gemfile

Gemfile.lock

README.md

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

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

app/assets/javascripts/commit/pipelines/pipelines_table.js

app/assets/javascripts/dispatcher.js

...ssets/javascripts/environments/components/environment.vue

app/assets/javascripts/environments/environments_bundle.js

...scripts/environments/folder/environments_folder_bundle.js

...ascripts/environments/folder/environments_folder_view.vue

...ts/javascripts/filtered_search/filtered_search_manager.js