Fix conflicts in ce-to-ee merge for ` 10-7-stable-ee-patch-1`
Fix conflicts for ce-to-ee merge for 10-7-stable-ee-patch-1
:
-
@nick.thomas lib/api/helpers/project_snapshots_helpers.rb
-
@marcia doc/user/project/merge_requests/index.md -
@marcia doc/user/project/web_ide/index.md -
@ash.mckenzie db/schema.rb -
@marcia doc/README.md -
@nick.thomas doc/api/projects.md -
@ayufan app/models/ci/job_artifact.rb -
@leipert app/assets/stylesheets/pages/commits.scss -
@felipe_artur app/assets/javascripts/boards/models/list.js
@nick.thomas please assign to the person next to you after fixing the conflicts
Thank you
Edited by Kamil Trzciński