CE upstream - Thursday
Files to resolve:
-
@lbennett Please resolve (UU) app/assets/images/icons.json
-
@lbennett Please resolve (UU) app/assets/images/icons.svg
-
@iamphill Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@filipa Please resolve (UU) app/assets/javascripts/project_find_file.js
-
@filipa Please resolve (UU) app/assets/javascripts/render_gfm.js
-
@filipa Please resolve (UU) app/assets/javascripts/search.js
-
@filipa Please resolve (UU) app/assets/javascripts/search_autocomplete.js
-
@iamphill Please resolve (UU) app/assets/stylesheets/framework/variables.scss
-
@winh Please resolve (UU) app/assets/stylesheets/pages/boards.scss
-
@filipa Please resolve (UU) app/assets/stylesheets/pages/merge_requests.scss
-
@rymai Please resolve (UU) app/controllers/admin/groups_controller.rb
-
TM Lee Please resolve (AA) app/presenters/group_member_presenter.rb
-
@rymai Please resolve (AA) app/presenters/member_presenter.rb
-
TM Lee Please resolve (AA) app/presenters/project_member_presenter.rb
-
@lbennett Please resolve (UU) app/views/projects/clusters/index.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/merge_requests/_mr_title.html.haml
-
@rymai Please resolve (UU) app/views/shared/members/_member.html.haml
-
@DouweM Please resolve (AA) app/workers/all_queues.yml
-
@DouweM Please resolve (UU) lib/gitlab/sidekiq_config.rb
-
@filipa Please resolve (UU) spec/javascripts/search_autocomplete_spec.js
-
@rymai Please resolve (UU) spec/models/ci/build_spec.rb
-
@zj Please resolve (UU) spec/models/merge_request_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2017-12-14
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 Lin Jen-Shin