CE upstream - Wednesday
Files to resolve:
-
@filipa Please resolve (UU) app/assets/javascripts/members.js
-
@filipa Please resolve (UU) app/assets/javascripts/project.js
-
@annabeldunstone Please resolve (UU) app/assets/stylesheets/framework/blank.scss
-
@annabeldunstone Please resolve (UU) app/assets/stylesheets/framework/mixins.scss
-
@smcgivern Please resolve (UU) app/models/merge_request.rb
-
@annabeldunstone Please resolve (UU) app/views/dashboard/projects/_zero_authorized_projects.html.haml
-
@MadLittleMods Please resolve (UU) app/views/shared/milestones/_sidebar.html.haml
-
@joshlambert Please resolve (UU) config/prometheus/additional_metrics.yml
-
@MadLittleMods Please resolve (UU) spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
-
@oswaldo Please resolve (UU) spec/lib/gitlab/checks/change_access_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2017-11-15
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 Oswaldo Ferreira