CE to EE Conflicts for RC6
-
Gemfile.lock -
Gemfile.rails5.lock -
VERSION -
app/assets/javascripts/job.js -
app/models/ci/pipeline.rb -
app/views/layouts/devise.html.haml -
app/views/layouts/devise_empty.html.haml -
app/views/projects/project_members/index.html.haml -
config/routes/api.rb -
db/schema.rb -
doc/api/namespaces.md -
doc/api/protected_branches.md -
doc/ci/variables/README.md -
doc/system_hooks/system_hooks.md -
doc/user/project/protected_branches.md -
lib/api/protected_branches.rb -
locale/gitlab.pot -
spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
Edited by Mayra Cabrera