Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-01
# Conflicts: # lib/gitlab/upgrader.rb # spec/finders/group_projects_finder_spec.rb # spec/finders/issues_finder_spec.rb # spec/finders/merge_requests_finder_spec.rb # spec/uploaders/job_artifact_uploader_spec.rb [ci skip]
Showing
Please register or sign in to comment