Warning message of failed rebase stays after locally having rebased

Summary

Warning message of failed rebase stays after locally having rebased

Steps to reproduce

(How one can reproduce the issue - this is very important)

  1. Have a mr where you are able to rebase using the UI
  2. Rebase, but have it fail
  3. Rebase locally
  4. Push to origin
  5. Refresh page, as HEAD has been changed
  6. Warning stays in place, even though the mr is ready to be merged

Example Project

Had it come up in https://gitlab.com/gitlab-org/design.gitlab.com/merge_requests/254

What is the current bug behavior?

Warning message of failed rebase stays after locally having rebased

What is the expected correct behavior?

Warning disappears as there is no rebase necessary anymore

Relevant logs and/or screenshots

image

Output of checks

This bug happens on GitLab.com

Results of GitLab environment info

Expand for output related to GitLab environment info

(For installations with omnibus-gitlab package run and paste the output of: sudo gitlab-rake gitlab:env:info)

(For installations from source run and paste the output of: sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production)

Results of GitLab application Check

Expand for output related to the GitLab application check

(For installations with omnibus-gitlab package run and paste the output of: sudo gitlab-rake gitlab:check SANITIZE=true)

(For installations from source run and paste the output of: sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production SANITIZE=true)

(we will only investigate if the tests are passing)

Possible fixes

(If you can, link to the line of code that might be responsible for the problem)