CE-EE merge prep branch conflicts
Resolve conflicts for merging CE prep branch into the EE counterpart:
-
@mdelaossa app/assets/javascripts/boards/models/list.js -
@mdelaossa app/assets/javascripts/boards/stores/boards_store.js -
@ClemMakesApps app/assets/stylesheets/framework/variables.scss -
@smcgivern app/finders/issues_finder.rb -
@mdelaossa app/services/boards/lists/create_service.rb -
@DouweM app/views/admin/appearances/_form.html.haml -
@lbennett app/views/groups/labels/index.html.haml -
@andr3 app/views/projects/pipelines/_with_tabs.html.haml -
@mikegreiling app/views/projects/settings/ci_cd/_autodevops_form.html.haml -
@lbennett app/views/shared/_label_row.html.haml -
@mdelaossa app/views/shared/issuable/_search_bar.html.haml -
@jprovaznik db/schema.rb -
@mayra-cabrera doc/topics/autodevops/index.md -
@DouweM lib/gitlab/favicon.rb -
@DouweM spec/lib/gitlab/favicon_spec.rb -
@balasankarc spec/lib/gitlab/usage_data_spec.rb
Please make this your highest priority. Thank you!
Edited by André Luís