CE upstream - Saturday

Files to resolve:

• @DouweM Please resolve (AA) db/migrate/20160621123729_add_rebase_commit_sha_to_merge_requests.rb
• Lin Jen-Shin (godfat) Please resolve (UU) lib/gitlab/git/repository.rb

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

Thanks in advance! ❤

@DouweM 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!