CE upstream - Wednesday

9ef6b3b0 - CE->EE: Fix conflicts in app/models/project_import_data.rb
d6b121b7 - CE->EE: Fix conflicts in spec/lib/gitlab/shell_spec.rb
02229f05 - CE->EE: Fix conflicts in spec/services/wiki_pages/update_service_spec.rb

Compare with previous version

added 3 commits

d55869f3 - Resolve conflict in .haml-lint.yml
8ec77f6b - Resolve conflict in app/helpers/dropdowns_helper.rb
d1cb1b2b - Resolve conflicts in app/models/merge_request.rb

Compare with previous version

marked the checklist item winniehell Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/.haml-lint.yml (UU) as completed

marked the checklist item @rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/Gemfile (UU) as completed

marked the checklist item @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/Gemfile.lock (UU) as completed

marked the checklist item @iamphill Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/dispatcher.js (UU) as completed

marked the checklist item @annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/new_sidebar.js (UU) as completed

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js (UU) as incomplete

marked the checklist item @annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/stylesheets/new_sidebar.scss (UU) as completed

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/models/project_import_data.rb (UU) as incomplete

marked the checklist item @annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/layouts/nav/_new_group_sidebar.html.haml (UU) as completed

marked the checklist item @annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/shared/_sidebar_toggle_button.html.haml (AA) as completed

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/fixtures/api/schemas/entities/merge_request.json (UU) as incomplete

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/lib/gitlab/shell_spec.rb (UU) as incomplete

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/serializers/merge_request_entity_spec.rb (UU) as incomplete

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/services/wiki_pages/update_service_spec.rb (UU) as incomplete

marked the checklist item @briann Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/models/merge_request.rb (UU) as completed

marked the checklist item @jschatz1 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/helpers/dropdowns_helper.rb (UU) as completed

marked the checklist item @smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/controllers/admin/health_check_controller.rb (UU) as completed

added 4 commits

5f3caaf7 - Resolve conflict in app/controllers/admin/health_check_controller.rb
459145fa - Resolve conflicts in app/models/repository.rb
ff552fbd - Resolve conflict in app/controllers/omniauth_callbacks_controller.rb
579da54f - Resolve conflicts in lib/api/entities.rb

Compare with previous version

added 3 commits

23596a1b - Resolve conflict in config/webpack.config.js
0787f417 - Fix conflict in app/assets/javascripts/project_select.js
b388b645 - Resolve conflict in app/assets/javascripts/api.js

Compare with previous version

marked the checklist item @jameslopez Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/controllers/omniauth_callbacks_controller.rb (UU) as completed

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/models/project_import_data.rb (UU) as completed

marked the checklist item @briann Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/models/repository.rb (UU) as completed

marked the checklist item @rdavila Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/lib/api/entities.rb (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/features/merge_requests/closes_issues_spec.rb (UU) as completed

added 4 commits

c2295e03 - Resolve conflict in lib/gitlab/usage_data.rb
8ec37f1c - Resolve conflict in app/views/shared/issuable/_sidebar.html.haml
4245ab11 - Resolve conflict in spec/features/merge_requests/closes_issues_spec.rb
fef3c69e - Resolve conflict in spec/initializers/6_validations_spec.rb

Compare with previous version

@rymai I was just about to push and you had already resolved it 8ec37f1c

marked the checklist item @lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/api.js (UU) as completed

marked the checklist item @brycepj Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/project_select.js (UU) as completed

marked the checklist item @selfup Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/shared/issuable/_sidebar.html.haml (UU) as completed

marked the checklist item @smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/lib/gitlab/usage_data.rb (UU) as completed

marked the checklist item @smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/initializers/6_validations_spec.rb (UU) as completed

marked the checklist item kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/config/webpack.config.js (UU) as completed

added 1 commit

c7a1773c - removed double import

Compare with previous version

marked the checklist item @rdavila Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/db/schema.rb (UU) as completed

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/lib/gitlab/shell_spec.rb (UU) as completed

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/serializers/merge_request_entity_spec.rb (UU) as completed

added 1 commit

4c0d0dfa - Resolve conflict in db/schema.rb

Compare with previous version

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/services/wiki_pages/update_service_spec.rb (UU) as completed

marked the checklist item kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/config/webpack.config.js (UU) as incomplete

marked the checklist item @smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/lib/gitlab/usage_data.rb (UU) as incomplete

marked the checklist item @smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/initializers/6_validations_spec.rb (UU) as incomplete

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/lib/gitlab/shell_spec.rb (UU) as incomplete

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/serializers/merge_request_entity_spec.rb (UU) as incomplete

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/services/wiki_pages/update_service_spec.rb (UU) as incomplete

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/fixtures/api/schemas/entities/merge_request.json (UU) as completed

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/serializers/merge_request_entity_spec.rb (UU) as completed

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js (UU) as completed

hmmm something is wrong, I marked one of the tasks assigned to me as completed but the above notification is about another task, this is the task that I marked:

@rdavila Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/db/schema.rb (UU)

And the notification is about:

Note that the notification is about an incomplete task. @iamphill @jschatz1 is this a known issue?

added 1 commit

4b8dd9b0 - fix conflicts in app/views/projects/jobs/_sidebar.html.haml

Compare with previous version

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js (UU) as incomplete

marked the checklist item @mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/projects/jobs/_sidebar.html.haml (UU) as completed

marked the checklist item kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/config/webpack.config.js (UU) as completed

marked the checklist item @smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/lib/gitlab/usage_data.rb (UU) as completed

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/fixtures/api/schemas/entities/merge_request.json (UU) as incomplete

marked the checklist item @smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/initializers/6_validations_spec.rb (UU) as completed

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/lib/gitlab/shell_spec.rb (UU) as completed

marked the checklist item @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/services/wiki_pages/update_service_spec.rb (UU) as completed

^ I also checked a single box and appear to have triggered several unrelated system notes about other checkboxes. This appears to be a bug.

@rymai I'm not sure how I got tagged for those conflicts. I didn't have anything to do with the changes.

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/stylesheets/framework/variables.scss (UU) as completed

added 1 commit

e2c085aa - resolve mr widget conflicts

Compare with previous version

@briann That's because you were the last committer on these files, that's all (but we've resolved the conflicts anyways so we're good!):

9770c57fab - Re-enable SqlInjection and CommandInjection (2 days ago) <Brian Neel>

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js (UU) as completed

Pushed resolution for all the remaining conflicts based on commits from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2629/commits, and also picked two commits directly from there.

changed milestone to %10.0

added 7 commits

c67cf9de - Resolve conflicts in app/assets/stylesheets/pages/merge_requests.scss
f386a01d - Resolve conflict in app/views/projects/jobs/_sidebar.html.haml
5eae5f38 - Resolve conflict in app/views/projects/tree/_tree_content.html.haml
8ad25ce0 - Resolve conflict in app/views/projects/tree/_tree_header.html.haml
2feec65a - Resolve conflict in app/views/shared/_import_form.html.haml
3cc7f46a - Fix linters
40756592 - Fix for spec/requests/api/boards_spec.rb

Compare with previous version

is this a known issue?

This appears to be a bug.

Yeah, I believe these are know bugs, unfortunately. :(

added 26 commits

40756592...3d14c212 - 25 commits from branch master
64c495ef - Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-08-09

Compare with previous version

@psimyn Could you please help fixing https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/28883029?

I think we're missing

  components: {
    statusIcon,
  },

in app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js

marked the checklist item @filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/shared/_import_form.html.haml (UU) as completed

marked the checklist item @DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/projects/tree/_tree_header.html.haml (UU) as completed

marked the checklist item @DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/projects/tree/_tree_content.html.haml (UU) as completed

marked the checklist item @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/stylesheets/pages/merge_requests.scss (UU) as completed

marked the checklist item @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/fixtures/api/schemas/entities/merge_request.json (UU) as completed

added 4 commits

d9c4d575 - Fix a Rubocop offense
5d05e108 - Reorder gems in Gemfile.lock
c43d03da - Fix wrong resolution of…
6eb3fb4e - Fix incomplete resolution of app/views/projects/tree/_old_tree_content.html.haml

Compare with previous version

Thanks @rymai!

approved this merge request

merged

mentioned in commit b5dbe0ba

Admin message

Admin message

CE upstream - Wednesday

Merge request reports

Activity