Conflicts:
both modified: GITLAB_SHELL_VERSION
deleted by us: app/assets/images/favicon-blue.ico
both modified: app/controllers/concerns/issuable_collections.rb
both modified: app/helpers/sorting_helper.rb
both modified: app/views/projects/branches/index.html.haml
both modified: app/views/projects/edit.html.haml
both modified: app/views/projects/pipelines/index.html.haml
both modified: app/views/shared/_sort_dropdown.html.haml
both modified: app/views/shared/boards/_show.html.haml
both modified: spec/policies/project_policy_spec.rb