Resolve conflicts ce-to-ee in `10-7-stable-ee-prepare-rc6`

Filipa Lacerdarequested to merge
10-7-stable-ee-prepare-rc6-ce-to-ee-conflicts into 10-7-stable-ee-prepare-rc6

Resolve conflicts ce-to-ee in 10-7-stable-ee-prepare-rc6

  • spec/policies/project_policy_spec.rb
  • doc/topics/autodevops/index.md
  • app/policies/project_policy.rb
  • app/views/admin/projects/show.html.haml
  • app/controllers/projects/issues_controller.rb
  • VERSION
Edited by Bob Van Landuyt

Merge request reports