CE upstream - 2018-02-01 12:25 UTC

Files to resolve:

• @tnir Please resolve (UU) lib/gitlab/upgrader.rb
• Jarka Kadlecová Please resolve (UU) spec/finders/group_projects_finder_spec.rb
• Jarka Kadlecová Please resolve (UU) spec/finders/issues_finder_spec.rb
• Jarka Kadlecová Please resolve (UU) spec/finders/merge_requests_finder_spec.rb
• @tnir Please resolve (UU) spec/uploaders/job_artifact_uploader_spec.rb

Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-01 branch.

Thanks in advance! ❤

@tnir After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.

Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!