CE upstream - 2018-09-07 16:58 UTC
Files to resolve:
-
@psimyn Please resolve (UU) app/assets/javascripts/boards/models/list.js
-
@jprovaznik Please resolve (UU) app/assets/javascripts/main.js
-
@dennis Please resolve (UU) app/assets/stylesheets/pages/groups.scss
-
@jprovaznik Please resolve (UU) app/models/concerns/issuable.rb
-
@ayufan Please resolve (AA) app/models/prometheus_metric.rb
-
@jprovaznik Please resolve (UU) app/models/resource_label_event.rb
-
@mayra-cabrera Please resolve (UU) app/presenters/commit_status_presenter.rb
-
@dennis Please resolve (UU) app/views/projects/project_members/index.html.haml
-
@ayufan Please resolve (UU) config/prometheus/common_metrics.yml
-
@jprovaznik Please resolve (UU) db/schema.rb
-
@jprovaznik Please resolve (AA) doc/api/resource_label_events.md
-
@ayufan Please resolve (AA) doc/development/prometheus_metrics.md
-
@jprovaznik Please resolve (UU) lib/api/entities.rb
-
@jprovaznik Please resolve (AA) lib/api/resource_label_events.rb
-
@mayra-cabrera Please resolve (UU) lib/gitlab/ci/status/build/failed.rb
-
@jprovaznik Please resolve (UU) lib/gitlab/import_export/import_export.yml
-
@jprovaznik Please resolve (UU) locale/gitlab.pot
-
@dennis Please resolve (AU) spec/features/projects/members/invite_group_and_members_spec.rb
-
@dennis Please resolve (UA) spec/features/projects/members/invite_group_spec.rb
-
@rspeicher Please resolve (DD) spec/features/projects/members/share_with_group_spec.rb
-
@jprovaznik Please resolve (AA) spec/features/usage_stats_consent_spec.rb
-
@jprovaznik Please resolve (UU) spec/lib/gitlab/import_export/all_models.yml
-
@jprovaznik Please resolve (UU) spec/lib/gitlab/import_export/safe_model_attributes.yml
-
@jprovaznik Please resolve (AA) spec/requests/api/resource_label_events_spec.rb
-
@leipert Please resolve (UU) yarn.lock
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-09-07
branch.
Thanks in advance!
@jprovaznik 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 Jan Provaznik