Skip to content
Snippets Groups Projects

Fix gitaly-proto version for gitlab-ce v10.7.1

All threads resolved!

What does this MR do?

Updates the gitaly-proto version for gitlab-ce v10.7.1 from v0.94.0 to v0.96.0

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

The GetSnapshot merge request originally updated the proto to v0.96.0, but just before merge, this was superceded by a commit to master that updated it to v0.97.0 - so no update hunk was picked to the 10.7 EE stable branch.

This MR fixes spec and production failures that will occur due to a dependency on missing constants and methods in the gitaly-proto gem.

It does not need to be merged to master, so I've set it to merge directly to the 10-7-stable-patch-1 branch.

Edited by Nick Thomas

Merge request reports

Pipeline #20848965 failed

Pipeline failed for 26ea4397 on 10-7-stable-patch-1-fix-gitaly-proto-version

Test coverage 55.14% (0.00%) from 1 job
Approved by

Merged by Filipa LacerdaFilipa Lacerda 6 years ago (Apr 23, 2018 11:05am UTC)

Merge details

  • Changes merged into 10-7-stable-patch-1 with 5cecb2ba.
  • Deleted the source branch.

Pipeline #20932275 failed

Pipeline failed for 5cecb2ba on 10-7-stable-patch-1

Test coverage 55.14% (0.00%) from 1 job

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Robert Speicher mentioned in merge request !18512 (merged)

    mentioned in merge request !18512 (merged)

  • @nick.thomas Could you please rebase this to bring in Stan's MySQL image fix from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18512 that I added to the prep MR branch.

  • Nick Thomas added 2 commits

    added 2 commits

    • badada04 - 1 commit from branch 10-7-stable-patch-1
    • 26ea4397 - GetSnapshot RPC requires gitaly-proto v0.96

    Compare with previous version

  • Nick Thomas resolved all discussions

    resolved all discussions

  • Done, just waiting for the EE version to be equally acceptable before assigning back.

  • Nick Thomas mentioned in merge request !18500 (merged)

    mentioned in merge request !18500 (merged)

  • assigned to @filipa

  • @filipa this is ready to be merged into 10-7-stable-patch-1. The remaining failures are due to other unfixed failures on that branch; this change solves all the ones with @DouweM by their name.

  • Filipa Lacerda approved this merge request

    approved this merge request

  • Filipa Lacerda mentioned in commit 5cecb2ba

    mentioned in commit 5cecb2ba

  • Please register or sign in to reply
    Loading