UI does not have any link to the main merge request page from an empty merge conflicts page

Summary

When you close a merge request and refresh the merge conflicts page, the UI has no easy way to travel from the merge conflicts page to the merge request main page.

Steps to reproduce

  • Create a merge request that will cause merge conflicts
  • Navigate to (project slug)/merge_requests/(mr number)/conflicts
  • See the conflicts, and solve them manually in your machine, doing a git push of the no-conflicts solution
  • Refresh the page and observe you get a message "The merge conflicts for this merge request have already been resolved. Please return to the merge request."
  • Verify every link on the page either goes to the main merge requests list (left side) or just refreshes the current page (breadcrumb)

What is the current bug behavior?

No way to travel to the main merge request page.

What is the expected correct behavior?

Either the message that indicates there are no merge conflicts should lead to the main merge request page, or it should be possible to travel to Discussion / Commits / Pipelines/ Changes.

Relevant logs and/or screenshots

image

Output of checks

Gitlab is running inside Docker.

Results of GitLab environment info

Expand for output related to GitLab environment info 
System information
System:
Current User:   git
Using RVM:      no
Ruby Version:   2.6.3p62
Gem Version:    2.7.9
Bundler Version:1.17.3
Rake Version:   12.3.2
Redis Version:  3.2.12
Git Version:    2.21.0
Sidekiq Version:5.2.7
Go Version:     unknown


GitLab information
Version:        12.1.0
Revision:       295480f4553
Directory:      /opt/gitlab/embedded/service/gitlab-rails
DB Adapter:     PostgreSQL
DB Version:     10.7
URL:            https://gitlab.(redacted).com
HTTP Clone URL: https://gitlab.(redacted).com/some-group/some-project.git
SSH Clone URL:  ssh://git@gitlab.(redacted).com:8022/some-group/some-project.git
Using LDAP:     yes
Using Omniauth: yes
Omniauth Providers:


GitLab Shell
Version:        9.3.0
Repository storage paths:
  • default: /var/opt/gitlab/git-data/repositories GitLab Shell path: /opt/gitlab/embedded/service/gitlab-shell Git: /opt/gitlab/embedded/bin/git

Results of GitLab application Check

Expand for output related to the GitLab application check 
Checking GitLab subtasks ...


Checking GitLab Shell ...


GitLab Shell: ... GitLab Shell version >= 9.3.0 ? ... OK (9.3.0)
Running /opt/gitlab/embedded/service/gitlab-shell/bin/check
Check GitLab API access: OK
Redis available via internal API: OK


Access to /var/opt/gitlab/.ssh/authorized_keys: OK
gitlab-shell self-check successful


Checking GitLab Shell ... Finished


Checking Gitaly ...


Gitaly: ... default ... OK


Checking Gitaly ... Finished


Checking Sidekiq ...


Sidekiq: ... Running? ... yes
Number of Sidekiq processes ... 1


Checking Sidekiq ... Finished


Checking Incoming Email ...


Incoming Email: ... Reply by email is disabled in config/gitlab.yml


Checking Incoming Email ... Finished


Checking LDAP ...


LDAP: ... Server: ldapmain
not verifying SSL hostname of LDAPS server '(redacted):636'
LDAP authentication... Success
LDAP users with access to your GitLab server (only showing the first 100 results)
User output sanitized. Found 100 users of 100 limit.


Checking LDAP ... Finished


Checking GitLab App ...


Git configured correctly? ... yes
Database config exists? ... yes
All migrations up? ... yes
Database contains orphaned GroupMembers? ... no
GitLab config exists? ... yes
GitLab config up to date? ... yes
Log directory writable? ... yes
Tmp directory writable? ... yes
Uploads directory exists? ... yes
Uploads directory has correct permissions? ... yes
Uploads directory tmp has correct permissions? ... skipped (no tmp uploads folder yet)
Init script exists? ... skipped (omnibus-gitlab has no init script)
Init script up-to-date? ... skipped (omnibus-gitlab has no init script)
Projects have namespace: ...
34/2 ... yes
34/4 ... yes
34/5 ... yes
34/6 ... yes
34/7 ... yes
34/8 ... yes
34/9 ... yes
34/10 ... yes
34/11 ... yes
34/12 ... yes
34/14 ... yes
34/15 ... yes
34/16 ... yes
34/17 ... yes
34/18 ... yes
34/19 ... yes
34/20 ... yes
34/21 ... yes
34/22 ... yes
Redis version >= 2.8.0? ... yes
Ruby version >= 2.5.3 ? ... yes (2.6.3)
Git version >= 2.21.0 ? ... yes (2.21.0)
Git user has default SSH configuration? ... yes
Active users: ... 8


Checking GitLab App ... Finished


Checking GitLab subtasks ... Finished
Edited by José Maia