CE upstream
both modified: .gitlab-ci.yml
both modified: CHANGELOG.md
both modified: app/assets/javascripts/environments/components/environment.js
both modified: app/assets/javascripts/environments/components/environment_item.js
both modified: app/assets/javascripts/environments/components/environments_table.js
both modified: app/assets/javascripts/filtered_search/filtered_search_dropdown.js
both modified: app/controllers/projects/issues_controller.rb
both modified: app/controllers/projects/wikis_controller.rb
both modified: app/helpers/sorting_helper.rb
both modified: app/models/project.rb
both modified: app/services/notification_service.rb
both added: app/views/groups/_settings_head.html.haml
both modified: app/views/groups/projects.html.haml
both modified: app/views/help/index.html.haml
both modified: app/views/layouts/nav/_group.html.haml
deleted by them: app/views/projects/blob/_actions.html.haml
both modified: app/views/projects/issues/index.html.haml
both modified: app/views/shared/issuable/_filter.html.haml
both modified: app/views/shared/issuable/_search_bar.html.haml
both modified: config/webpack.config.js
both modified: db/schema.rb
both modified: doc/api/v3_to_v4.md
both added: spec/controllers/admin/application_settings_controller_spec.rb
both modified: spec/controllers/projects/merge_requests_controller_spec.rb
both modified: spec/requests/api/commits_spec.rb