CE upstream - 2018-11-07 21:57 UTC
Files to resolve:
-
@okoghenun Please resolve (UU) app/assets/javascripts/boards/components/issue_card_inner.vue
-
@okoghenun Please resolve (AA) app/assets/javascripts/boards/components/issue_time_estimate.vue
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/environments/components/environments_table.vue
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/jobs/components/job_app.vue
-
@okoghenun Please resolve (UU) app/assets/stylesheets/pages/boards.scss
-
@okoghenun Please resolve (UU) app/controllers/boards/issues_controller.rb
-
@jarka Please resolve (UU) app/controllers/projects/autocomplete_sources_controller.rb
-
@tiagonbotelho Please resolve (UU) app/views/admin/application_settings/_email.html.haml
-
@toon Please resolve (UU) db/schema.rb
-
@matteeyah Please resolve (UU) doc/ci/variables/README.md
-
@matteeyah Please resolve (UU) doc/ci/yaml/README.md
-
@axil Please resolve (UU) doc/install/README.md
-
@tiagonbotelho Please resolve (UU) doc/user/admin_area/settings/email.md
-
@matteeyah Please resolve (UU) lib/gitlab/ci/config/entry/job.rb
-
@matteeyah Please resolve (AA) lib/gitlab/ci/config/normalizer.rb
-
@okoghenun Please resolve (UU) locale/gitlab.pot
-
@yorickpeterse Please resolve (UU) spec/finders/snippets_finder_spec.rb
-
@matteeyah Please resolve (AA) spec/lib/gitlab/ci/config/normalizer_spec.rb
-
@tiagonbotelho Please resolve (UU) spec/models/user_spec.rb
-
@stanhu Please resolve (UU) spec/support/helpers/migrations_helpers.rb
-
@lulalala Please resolve (UU) spec/support/helpers/test_env.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-07
branch.
Thanks in advance!
@matteeyah 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 Steve Xuereb