Merging branches are not detected by gitlab but was done in repos
Summary
While merging a branch other
into default
using gitlab web interface, the merge was done behind the sane
but it does not looks like merged for gitlab.
Steps to reproduce
- create a new repo
- commit in
default
branch - create
other
branch - create a commit in
other
branch
Note: I've clicked twice on the merge button, the first time I've check the delete branch button to play with some known limits ;)
Example Project
(If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report)
(If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version)
What is the current bug behavior?
The merge request still open in gitlab web interface
What is the expected correct behavior?
Merge request closed after merging
Relevant logs and/or screenshots
(Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's very hard to read otherwise.)
Output of checks
(If you are reporting a bug on GitLab.com, write: 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
):gitlab-rake gitlab:env:info System information System: Current User: git Using RVM: no Ruby Version: 2.3.5p376 Gem Version: 2.6.13 Bundler Version:1.13.7 Rake Version: 12.1.0 Redis Version: 3.2.5 Git Version: 2.13.6 Sidekiq Version:5.0.4 Go Version: unknown GitLab information Version: 10.1.4 Revision: fatal: Not a git repository (or any of the parent directories): .git Directory: /opt/gitlab/embedded/service/gitlab-rails DB Adapter: postgresql URL: http://localhost HTTP Clone URL: http://localhost/some-group/some-project SSH Clone URL: git@localhost:some-group/some-project.git Using LDAP: no Using Omniauth: no GitLab Shell Version: 5.9.3 Repository storage paths: - default: /var/opt/gitlab/git-data/repositories Hooks: /opt/gitlab/embedded/service/gitlab-shell/hooks Git: /opt/gitlab/embedded/bin/git
Here the heptapod version used in my docker image:
root@localhost:/var/opt/gitlab/nginx# hg -R /opt/gitlab/embedded/service/gitlab-rails/ summary
parent: 70499:8656e5066a75
Update the rake backups task to include Mercurial repositories
branch: heptapod
commit: 5 deleted, 4719 unknown (clean)
update: 23 new changesets, 10 branch heads (merge)