CE upstream - 2018-03-29 12:26 UTC
Files to resolve:
-
@jacobvosmaer-gitlab Please resolve (UU) .flayignore
-
@filipa Please resolve (UU) CHANGELOG.md
-
@jivanvl Please resolve (UU) app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue
-
@jivanvl Please resolve (UU) app/controllers/projects/milestones_controller.rb
-
@MadLittleMods Please resolve (UU) app/helpers/page_layout_helper.rb
-
@tmaczukin Please resolve (UU) app/models/ci/runner.rb
-
@MadLittleMods Please resolve (UU) app/views/ci/variables/_variable_row.html.haml
-
@MadLittleMods Please resolve (UU) app/views/import/github/new.html.haml
-
Elias Werberich Please resolve (UU) app/views/layouts/nav/sidebar/_project.html.haml
-
@MadLittleMods Please resolve (UU) app/views/projects/new.html.haml
-
@MadLittleMods Please resolve (UU) app/views/shared/_import_form.html.haml
-
Bheesham Persaud Please resolve (UU) doc/install/README.md
-
Semyon Pupkov Please resolve (UU) spec/features/groups/activity_spec.rb
-
Semyon Pupkov Please resolve (UU) spec/features/groups/issues_spec.rb
-
Semyon Pupkov Please resolve (UU) spec/features/groups/show_spec.rb
-
@MadLittleMods Please resolve (UU) spec/javascripts/fixtures/projects.rb
-
@tmaczukin Please resolve (UU) spec/services/ci/retry_build_service_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-29
branch.
Thanks in advance!
@MadLittleMods 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 Jose Ivan Vargas