Skip to content

CE stable to EE stable merge for 9.2.1 Patch release

Kushal Pandya requested to merge 9-2-stable-ce-to-ee-merge into 9-2-stable-ee

This MR is to perform CE 9-2-stable into EE 9-2-stable-ee merge.

It ran into conflicts for the following files.

  • @oswaldo - resolve app/controllers/projects/merge_requests_controller.rb
  • @alfredo1 - resolve app/views/admin/users/index.html.haml
  • @oswaldo - resolve spec/controllers/projects/merge_requests_controller_spec.rb
  • @oswaldo - resolve spec/fixtures/api/schemas/entities/merge_request_basic.json

Kindly resolve conflicts and push your changes into this MR (DO NOT force push!).

Edited by Alfredo Sumaran

Merge request reports