Merge button does not appear after Rebase-ing
Summary
After clicking on the [Rebase] button, [Merge] does not appear. Reloading the page makes it appears correctly.
Using GitLab 10.7.3. I can reproduce on Firefox 62.0a1 (2018-05-12) (a bit old), and 60.0.1.
Steps to reproduce
- Settings > General > Merge request settings > (x) Fast-forward merge
- Go to MR, select [Rebase]
- Rebase apparently succeeds
What is the current bug behavior?
The .mr-widget-section
element appears empty, (where the merge button is supposed to be).
It shows up when reloading the page.
What is the expected correct behavior?
Merge button shows up directly after rebase succeeds.
Output of checks
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.3.6p384 Gem Version: 2.6.13 Bundler Version:1.13.7 Rake Version: 12.3.0 Redis Version: 3.2.11 Git Version: 2.14.3 Sidekiq Version:5.0.5 Go Version: unknownGitLab information Version: 10.7.3 Revision: 2555d6c Directory: /opt/gitlab/embedded/service/gitlab-rails DB Adapter: postgresql URL: https://gitlab.example.com HTTP Clone URL: https://gitlab.example.com/some-group/some-project.git SSH Clone URL: git@gitlab.example.com:some-group/some-project.git Using LDAP: no Using Omniauth: yes Omniauth Providers: phabricator
GitLab Shell Version: 7.1.2 Repository storage paths:
- default: /var/opt/gitlab/git-data/repositories Hooks: /opt/gitlab/embedded/service/gitlab-shell/hooks Git: /opt/gitlab/embedded/bin/git
Results of GitLab application Check
Expand for output related to the GitLab application check
Checking GitLab Shell ...GitLab Shell version >= 7.1.2 ? ... OK (7.1.2) Repo base directory exists? default... yes Repo storage directories are symlinks? default... no Repo paths owned by git:root, or git:git? default... yes Repo paths access is drwxrws---? default... yes hooks directories in repos are links: ... 3/1 ... ok 46/3 ... ok 46/6 ... ok [..] 15/1015 ... ok
180/1016 ... ok
Running /opt/gitlab/embedded/service/gitlab-shell/bin/check Check GitLab API access: OK Redis available via internal API: OKAccess to /var/opt/gitlab/.ssh/authorized_keys: OK
gitlab-shell self-check successfulChecking GitLab Shell ... Finished
Checking Sidekiq ...
Running? ... yes
Number of Sidekiq processes ... 1Checking Sidekiq ... Finished
Reply by email is disabled in config/gitlab.yml
Checking LDAP ...LDAP is disabled in config/gitlab.yml
Checking LDAP ... Finished
Checking GitLab ...
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? ... yes 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/1 ... yes
46/3 ... yes
46/6 ... yes
[..] 15/1015 ... yes 180/1016 ... yes Redis version >= 2.8.0? ... yes Ruby version >= 2.3.5 ? ... yes (2.3.6) Git version >= 2.9.5 ? ... yes (2.14.3) Git user has default SSH configuration? ... yes Active users: ... 118Checking GitLab ... Finished