Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-20
# Conflicts: # app/assets/javascripts/jobs/components/job_app.vue # doc/api/groups.md # doc/user/group/index.md # spec/models/project_spec.rb [ci skip]
Showing
Please register or sign in to comment