Skip to content
Snippets Groups Projects
New issue look: Off

Summary: MR discussion may be vanished when the branch commit is updated.

    • Closed Issue created by gitlab-qa-bot @gitlab-qa-bot

    Created by: lurdan

    Steps to reproduce:

    1. Create MR
    2. comment on MR from diff view (specifying a certain line)
    3. push new commit to the MRed branch (befor merge). This commit should include changes which makes original comment line out of diff range (in MR page)
    4. display the MR page.

    Expected behavior:

    I want that there is some commented line number tracking in the MR lifecycle.

    Observed behavior:

    a) Old comment seems to be corrupted (There is no line number which originally commentedin MR diff view) b) Old comment moved to independent line. (The line number which originally commented still exits but pointed different line in MR diff view)

    Relevant logs and/or screen shots:

    A screen shot is added as comment.

    Output of checks:

    • sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
    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: ...
system / puppet ... ok
fcpkg / bacula ... ok
fcpkg / specter ... ok
fcpkg / samhain ... ok
fcpkg / spamassassin ... ok
FREGI-SA / Notice ... ok
system / etckeeper-fregi-old-devel ... 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? ...
system / puppet ... yes
fcpkg / bacula ... yes
fcpkg / specter ... yes
fcpkg / samhain ... yes
fcpkg / spamassassin ... yes
FREGI-SA / Notice ... yes
system / etckeeper-fregi-old-devel ... 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
    • Version and last commit: 5.2.0 02a7b127
    • sudo -u git -H bundle exec rake gitlab:env:inf
    System information
System:         Debian 6.0.7
Current User:   git
Using RVM:      no
Ruby Version:   1.9.3p392
Gem Version:    2.0.3
Bundler Version:1.3.5
Rake Version:   10.0.4

GitLab information
Version:        5.2.0
Revision:       02a7b12
Directory:      /home/git/gitlab
DB Adapter:     mysql2
URL:            http://vcs01.ope.manage.local
HTTP Clone URL:
SSH Clone URL:
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

    Possible fixes: It's difficult to fix this, I guess. At least comments and specified line number should associated with commits included the MR, and MR view summarize such comments in some way...? (Though I can't analyze gitlab codebase, it seems to have comment data and simply maps it to latest branch diff?)

    Designs

      Child items ...

      2. Activity

      Please register or sign in to reply