CE upstream - 2018-07-10 15:22 UTC
Files to resolve:
-
@winh Please resolve (UU) app/assets/javascripts/environments/components/environment_item.vue
-
@winh Please resolve (UU) app/serializers/environment_entity.rb
-
@dennis Please resolve (UU) app/views/admin/application_settings/show.html.haml
-
@dennis Please resolve (UU) db/schema.rb
-
@axil Please resolve (UU) doc/ci/examples/README.md
-
@axil Please resolve (UU) doc/topics/autodevops/index.md
-
@axil Please resolve (UU) doc/user/project/merge_requests/index.md
-
@rdavila Please resolve (UU) lib/gitlab/git_access.rb
-
Ave Please resolve (UU) locale/gitlab.pot
-
@rdavila Please resolve (UU) spec/lib/gitlab/git_access_spec.rb
-
@winh Please resolve (UU) spec/serializers/environment_entity_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-07-10
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 Rubén Dávila