Resolve conflicts button looks disabled

Summary

When merge conflicts exist for a merge request the button to resolve conflicts appears to be disabled but is clickable.

Steps to reproduce

  • Add a group
  • Create a project under that group
  • Add a file icecream to the project
  • Fork the project to your account
  • In the original project write vanilla into the file icecream (and commit it)
  • In the fork write chocolate into the file icecream (and commit it)
  • Create a merge request from the fork to the original. There is now a merge conflict.

What is the current bug behavior?

The button to resolve conflicts is shown. It's designs and the appearing tool tip (This feature merges changes from the target branch to the source branch. You cannot use this feature since the source branch is protected.) make it look like it can't be used. However you can still click on the button and use the webgui to resolve the conflict.

What is the expected correct behavior?

Make it better to identifiy that clicking the button is an possibility. Do not show it as greyed out.

Maybe some kind of combined button that offers a default action and more actions in a drop down menu would be a good idea.

Relevant logs and/or screenshots

gitlab-resolve_conflicts

Compare it to the button shown in the docs.

Output of checks

Results of GitLab environment info

Expand for output related to GitLab environment info 

System information
System:
Proxy:          no
Current User:   git
Using RVM:      no
Ruby Version:   2.6.6p146
Gem Version:    2.7.10
Bundler Version:1.17.3
Rake Version:   12.3.3
Redis Version:  5.0.9
Git Version:    2.27.0
Sidekiq Version:5.2.7
Go Version:     unknown

GitLab information
Version:        13.1.1-ee
Revision:       a604fffd4ba
Directory:      /opt/gitlab/embedded/service/gitlab-rails
DB Adapter:     PostgreSQL
DB Version:     11.7
URL:            https://sl-02365..de
HTTP Clone URL: https://sl-02365..de/some-group/some-project.git
SSH Clone URL:  git@sl-02365..de:some-group/some-project.git
Elasticsearch:  no
Geo:            no
Using LDAP:     no
Using Omniauth: yes
Omniauth Providers: 

GitLab Shell
Version:        13.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 >= 13.3.0 ? ... OK (13.3.0)
Running /opt/gitlab/embedded/service/gitlab-shell/bin/check
Internal API available: OK
Redis available via internal API: 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: ... LDAP is disabled in config/gitlab.yml


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: ...
3/4 ... yes
1/5 ... yes
Redis version >= 4.0.0? ... yes
Ruby version >= 2.5.3 ? ... yes (2.6.6)
Git version >= 2.22.0 ? ... yes (2.27.0)
Git user has default SSH configuration? ... yes
Active users: ... 1
Is authorized keys file accessible? ... yes
GitLab configured to store new projects in hashed storage? ... yes
All projects are in hashed storage? ... yes
Elasticsearch version 5.6 - 6.x? ... skipped (elasticsearch is disabled)


Checking GitLab App ... Finished


Checking GitLab subtasks ... Finishedgitlab-resolve_conflicts

Possible fixes