CE upstream - Tuesday
Files to resolve:
-
@iamphill Please resolve (UU) app/assets/javascripts/sidebar/sidebar_mediator.js
-
@MadLittleMods Please resolve (UU) app/assets/stylesheets/framework/variables.scss
-
@mikegreiling Please resolve (UU) app/assets/stylesheets/pages/groups.scss
-
micael.bergeron Please resolve (UU) app/controllers/projects/merge_requests_controller.rb
-
Jarka Kadlecova Please resolve (UU) app/models/epic.rb
-
@DouweM Please resolve (UU) app/models/user.rb
-
Jarka Kadlecova Please resolve (UU) app/policies/group_policy.rb
-
@ayufan Please resolve (UU) app/services/ci/create_pipeline_service.rb
-
@jamedjo Please resolve (AA) app/services/protected_branches/access_level_params.rb
-
@jamedjo Please resolve (AA) app/services/protected_branches/api_service.rb
-
@MadLittleMods Please resolve (UU) app/views/layouts/_search.html.haml
-
@annabeldunstone Please resolve (UU) app/views/layouts/nav/sidebar/_group.html.haml
-
micael.bergeron Please resolve (UU) app/views/projects/commits/_commit.html.haml
-
@MadLittleMods Please resolve (UU) app/views/projects/issues/show.html.haml
-
@MadLittleMods Please resolve (UU) app/views/shared/_outdated_browser.html.haml
-
Jarka Kadlecova Please resolve (UU) config/routes/group.rb
-
@marcia Please resolve (AA) doc/administration/index.md
-
@marcia Please resolve (AA) doc/administration/operations/index.md
-
@rymai Please resolve (AA) doc/development/automatic_ce_ee_merge.md
-
Luke "Jared" Bennett Please resolve (UD) doc/development/limit_ee_conflicts.md
-
@DouweM Please resolve (UU) lib/api/entities.rb
-
Francisco Lopez Please resolve (UU) lib/api/projects.rb
-
Jarka Kadlecova Please resolve (AA) lib/banzai/filter/epic_reference_filter.rb
-
Jarka Kadlecova Please resolve (UU) lib/banzai/filter/upload_link_filter.rb
-
Jarka Kadlecova Please resolve (AA) lib/banzai/reference_parser/epic_parser.rb
-
@ayufan Please resolve (AA) lib/gitlab/ci/pipeline/chain/command.rb
-
@mayra-cabrera Please resolve (UU) lib/gitlab/git_access.rb
-
@mkozono Please resolve (UU) lib/gitlab/utils.rb
-
Jarka Kadlecova Please resolve (AA) spec/helpers/boards_helper_spec.rb
-
micael.bergeron Please resolve (UU) spec/helpers/merge_requests_helper_spec.rb
-
@iamphill Please resolve (UU) spec/javascripts/boards/boards_store_spec.js
-
Jarka Kadlecova Please resolve (UU) spec/lib/banzai/filter/upload_link_filter_spec.rb
-
@ayufan Please resolve (UU) spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
-
@mayra-cabrera Please resolve (UU) spec/models/namespace_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2017-12-12
branch.
Thanks in advance!
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 Valery Sizov