CE upstream - 2018-02-05 09:56 UTC
Files to resolve:
-
@mikegreiling Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@mikegreiling Please resolve (UU) app/assets/javascripts/main.js
-
@MadLittleMods Please resolve (UU) app/assets/stylesheets/framework.scss
-
@mdelaossa Please resolve (UU) app/controllers/application_controller.rb
-
@mdelaossa Please resolve (UU) app/helpers/projects_helper.rb
-
@mdelaossa Please resolve (UU) app/models/note.rb
-
@mdelaossa Please resolve (UU) app/models/protected_branch.rb
-
@mdelaossa Please resolve (UU) app/services/ci/register_job_service.rb
-
@mdelaossa Please resolve (UU) app/services/users/build_service.rb
-
@mdelaossa Please resolve (UU) app/views/admin/health_check/show.html.haml
-
@MadLittleMods Please resolve (AA) app/views/ci/variables/_variable_row.html.haml
-
@mdelaossa Please resolve (UU) app/views/help/index.html.haml
-
@mdelaossa Please resolve (UU) app/views/layouts/devise.html.haml
-
@mdelaossa Please resolve (UU) app/views/layouts/nav/sidebar/_profile.html.haml
-
@mdelaossa Please resolve (UU) lib/api/helpers/runner.rb
-
@mdelaossa Please resolve (UU) lib/gitlab/auth.rb
-
@mdelaossa Please resolve (UU) spec/lib/gitlab/current_settings_spec.rb
-
@mdelaossa Please resolve (UU) spec/lib/gitlab/usage_data_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-05
branch.
Thanks in advance!
@mdelaossa After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
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 Mario de la Ossa