Skip to content

GitLab

Closed
Created by Administrator@rootOwner

Pushed branch cannot be merged, is displayed incorrectly

Created by: nTraum

Summary: Pushed branch swap_country_class_recruitment_page is not listed in merge request nor in 'branch quick selection'.

Steps to reproduce:

  • git clone [url]
  • git checkout -b 'new_branch'
  • touch foo.bar; git add foo.bar; git commit -m 'foo.bar added'
  • git push -u origin new_branch:new_branch

I'd like to add more specific steps to reproduce this issue, but I don't know what.

Expected behaviour:

  • Being able to select the branch for the merge request.
  • Showing the correct branch name when clicking on dashboard link.
  • Branch should be listed in 'branch quick selection'

Observed behaviour:

  • Branch is not listed at merge requests [2]/[3]
  • Clicking on the link to the branch from the dashboard shows an incorrect branch name dave_capabilities, but displays the correct commits [4]
  • Branch is not listed in 'branch quick selection' [4]
  • Branch is listed in branches overview though [5]

Screenshots: [1] http://i.imgur.com/E9E3yDZ.png - Dashboard [2] http://i.imgur.com/AkzyOM5.png - Merge request [3] http://i.imgur.com/tPUlSmk.png - Merge request - branch selection [4] http://i.imgur.com/RX68hGC.png - Wrong branch name, correct commits though [5] http://i.imgur.com/N1XZ6sX.png - Branches overview, branch showing up

Output of checks:

sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
[sudo] password for ntraum: 
Checking Environment ...

Git configured for git user? ... yes
Has python2? ... yes
python2 is supported version? ... yes

Checking Environment ... Finished

Checking GitLab Shell ...

GitLab Shell version >= 1.4.0 ? ... OK (1.4.0)
Repo base directory exists? ... yes
Repo base directory is a symlink? ... no
Repo base owned by git:git? ... yes
Repo base access is drwxrws---? ... yes
post-receive hook up-to-date? ... yes
post-receive hooks in repos are links: ... yes
Philipp Preß / ETF2L ... ok
Philipp Preß / GameServer Files ... ok
Philipp Preß / munin-etf2l ... ok
rbot-etf2l ... ok
Dave / API ... ok

Checking GitLab Shell ... Finished

Checking Sidekiq ...

Running? ... yes

Checking Sidekiq ... Finished

Checking GitLab ...

Database config exists? ... yes
Database is SQLite ... no
All migrations up? ... yes
GitLab config exists? ... yes
GitLab config outdated? ... no
Log directory writable? ... yes
Tmp directory writable? ... yes
Init script exists? ... yes
Init script up-to-date? ... yes
Projects have satellites? ... 
Philipp Preß / ETF2L ... yes
Philipp Preß / GameServer Files ... yes
Philipp Preß / munin-etf2l ... yes
rbot-etf2l ... yes
Dave / API ... yes
Redis version >= 2.0.0? ... yes
Your git bin path is "/usr/bin/git"
Git version >= 1.7.10 ? ... yes (1.7.10)

Checking GitLab ... Finished
sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production

System information
System:     Debian 7.0
Current User:   git
Using RVM:  no
Ruby Version:   1.9.3p327
Gem Version:    1.8.23
Bundler Version:1.3.5
Rake Version:   10.0.4

GitLab information
Version:    5.2.0
Revision:   86874f0
Directory:  /home/git/gitlab
DB Adapter: mysql2
URL:        http://gitlab.etf2l.org
HTTP Clone URL: http://gitlab.etf2l.org/some-project.git
SSH Clone URL:  [email protected]:some-project.git
Using LDAP: no
Using Omniauth: no

GitLab Shell
Version:    1.4.0
Repositories:   /home/git/repositories/
Hooks:      /home/git/gitlab-shell/hooks/
Git:        /usr/bin/git

GitLab Version: 5.2