CE upstream - 2018-07-23 09:40 UTC
Files to resolve:
-
Kukovskii Vladimir Please resolve (UU) doc/user/project/integrations/project_services.md
-
@godfat Please resolve (UU) lib/api/services.rb
-
@godfat Please resolve (UU) lib/gitlab/auth.rb
-
@godfat Please resolve (UU) lib/gitlab/omniauth_initializer.rb
-
@rspeicher Please resolve (UU) locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-07-23
branch.
Thanks in advance!
@godfat 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 Lin Jen-Shin