Skip to content

CE Upstream - Monday

Dmytro Zaporozhets (DZ) requested to merge ce-to-ee into master

Conflicts:

  • both modified: .gitlab-ci.yml
  • 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/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/layouts/nav/_group.html.haml
  • deleted by them: app/views/projects/blob/_actions.html.haml
  • both modified: app/views/shared/issuable/_filter.html.haml
  • both modified: app/views/shared/issuable/_search_bar.html.haml
  • both modified: db/schema.rb
  • both modified: spec/requests/api/commits_spec.rb

Merge request reports