CE upstream - Tuesday
Files to resolve:
-
@mkozono Please resolve (UU) app/views/admin/application_settings/_form.html.haml
-
@axil Please resolve (AA) db/migrate/20160301174731_add_fingerprint_index.rb
-
@rspeicher Please resolve (UU) db/schema.rb
-
@ernstvn Please resolve (AA) doc/administration/operations/fast_ssh_key_lookup.md
-
@jamedjo Please resolve (UU) doc/administration/operations/index.md
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-09
branch.
Thanks in advance!
@axil 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!
Edited by Michael Kozono