rebase button yields error message

Summary

go to the website : https://gitlab.com/inkscape/inkscape/merge_requests/39 press the Rebase button get the attached error message

added Discussion label

added Platform label

/cc: @smcgivern, @JobV

removed Platform label

Thanks for reporting, @alvinpenner!

When we're showing the button that lets you rebase, it looks like we check whether or not you can push to the source branch (in this case, your fork): https://gitlab.com/gitlab-org/gitlab-ee/blob/v9.3.5-ee/app/assets/javascripts/vue_merge_request_widget/ee/components/states/mr_widget_rebase.js#L81

However, on the backend, we check whether you can merge the MR: https://gitlab.com/gitlab-org/gitlab-ee/blob/v9.3.5-ee/app/controllers/projects/merge_requests_controller.rb#L342

This second check seems clearly wrong, but it's been around since the feature was first implemented, in 8.0.0! https://gitlab.com/gitlab-org/gitlab-ee/commit/34457b307bb4d60a8abe8be3e63b44f986b802bd

And we displayed the button in the same case that we do now: https://gitlab.com/gitlab-org/gitlab-ee/blob/v8.0.0-ee/app/helpers/branches_helper.rb#L18

So this bug has been around since September 2015 - thanks for catching it

added ~1918971 bug ~155976 labels

thanks for investigating!

Alvin

changed milestone to %9.5

assigned to @smcgivern

mentioned in merge request !2414 (merged)

@alvinpenner I have a fix in review now, but unfortunately this won't be deployed to GitLab.com until we deploy our first release candidate for 9.5, in about a month's time. Until then, you'll need to rebase manually

closed via merge request !2414 (merged)

no problem, I can wait.

Alvin

mentioned in commit b2a8a27b

mentioned in issue #3033

mentioned in merge request inkscape/inkscape!61 (merged)