Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25
# Conflicts: # app/assets/javascripts/jobs/components/job_app.vue # app/assets/javascripts/jobs/store/getters.js # spec/javascripts/jobs/store/getters_spec.js [ci skip]
Showing
Please register or sign in to comment