Commenting on an image stored in git LFS results in a crash and prevents anyone from seeing the MR
Summary
When in an MR, if you comment on an image that is stored in git LFS, the whole merge request will become broken and return a 500 error.
Steps to reproduce
- Create a project with git-lfs (make sure that git-lfs tracks images)
- Create a branch
- Add an image to that branch (in my case it was a png)
- Create a MR from that branch
- Open the diff
- Click on the image to leave a comment
- Type something and press "Comment"
Example Project
I can't reproduce this in gitlab.com. I didn't find a way to enable git-lfs for a test project
What is the current bug behavior?
Trying to leave a comment fails and refreshing the page returns a 500 error. Trying to open the MR in question will return a 500 error.
What is the expected correct behavior?
- Being able to comment on images stored in git-lfs
- No crash
Relevant logs and/or screenshots
Started GET "/catalog/tires/merge_requests/53" for 10.0.0.211 at 2018-03-01 18:11:20 -0500
Processing by Projects::MergeRequestsController#show as HTML
Parameters: {"namespace_id"=>"catalog", "project_id"=>"tires", "id"=>"53"}
Completed 500 Internal Server Error in 229ms (ActiveRecord: 22.2ms)
ActionView::Template::Error (undefined method `index' for nil:NilClass):
11: - if diff_file.text?
12: .diff-content.code.js-syntax-highlight
13: %table
14: = render partial: "projects/diffs/line",
15: collection: discussion.truncated_diff_lines,
16: as: :line,
17: locals: { diff_file: diff_file,
app/models/concerns/discussion_on_diff.rb:44:in `truncated_diff_lines'
app/views/discussions/_diff_with_notes.html.haml:14:in `_app_views_discussions__diff_with_notes_html_haml__3886095325696593677_70326197261940'
app/views/discussions/_discussion.html.haml:52:in `_app_views_discussions__discussion_html_haml__3447403882225270461_70326191186320'
app/views/shared/notes/_notes.html.haml:6:in `block in _app_views_shared_notes__notes_html_haml__2214695235092413558_70326073662220'
app/views/shared/notes/_notes.html.haml:2:in `each'
app/views/shared/notes/_notes.html.haml:2:in `_app_views_shared_notes__notes_html_haml__2214695235092413558_70326073662220'
app/views/shared/notes/_notes_with_form.html.haml:5:in `_app_views_shared_notes__notes_with_form_html_haml___453438169786757728_70326067359480'
app/views/projects/merge_requests/_discussion.html.haml:11:in `_app_views_projects_merge_requests__discussion_html_haml___117645824980233695_70326066307020'
app/views/projects/merge_requests/show.html.haml:79:in `_app_views_projects_merge_requests_show_html_haml___533273213205007987_70326047622100'
app/controllers/projects/merge_requests_controller.rb:53:in `block (2 levels) in show'
app/controllers/projects/merge_requests_controller.rb:38:in `show'
lib/gitlab/i18n.rb:47:in `with_locale'
lib/gitlab/i18n.rb:53:in `with_user_locale'
app/controllers/application_controller.rb:325:in `set_locale'
lib/gitlab/middleware/multipart.rb:95:in `call'
lib/gitlab/request_profiler/middleware.rb:14:in `call'
lib/gitlab/middleware/go.rb:17:in `call'
lib/gitlab/etag_caching/middleware.rb:11:in `call'
lib/gitlab/middleware/read_only.rb:31:in `call'
lib/gitlab/request_context.rb:18:in `call'
lib/gitlab/metrics/requests_rack_middleware.rb:27:in `call'
Output of checks
Results of GitLab environment info
Expand for output related to GitLab environment info
System information System: Debian 8.10 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.5.2 Revision: b951e0d Directory: /opt/gitlab/embedded/service/gitlab-rails DB Adapter: postgresql URL: https://REDACTED HTTP Clone URL: https://REDACTED/some-group/some-project.git SSH Clone URL: ssh://git@REDACTED/some-group/some-project.git Using LDAP: no Using Omniauth: no
GitLab Shell Version: 6.0.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
Results of GitLab application Check
Expand for output related to the GitLab application check
Checking GitLab Shell ...GitLab Shell version >= 6.0.3 ? ... OK (6.0.3) 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: ... 1/2 ... ok 3/6 ... ok 7/16 ... ok 8/17 ... ok 8/18 ... ok 8/19 ... ok 7/20 ... ok 7/21 ... ok 8/22 ... ok 7/23 ... ok 7/26 ... ok 8/27 ... ok 8/28 ... ok 8/29 ... ok 8/30 ... ok 8/31 ... ok 8/32 ... ok 3/33 ... repository is empty 3/35 ... ok 8/36 ... ok 18/39 ... ok 11/40 ... ok 8/41 ... ok 8/42 ... ok 13/43 ... ok 17/44 ... ok 18/45 ... ok 7/46 ... ok 13/47 ... ok 8/48 ... ok 8/49 ... ok 19/54 ... ok 11/55 ... ok 11/56 ... ok 8/57 ... ok 22/60 ... ok 18/64 ... ok 8/74 ... ok 13/75 ... ok 18/76 ... ok 7/77 ... ok 18/78 ... ok 8/79 ... ok 18/80 ... ok 8/81 ... ok 8/82 ... ok 11/83 ... ok 22/84 ... ok 8/85 ... ok 7/86 ... ok 13/87 ... ok 18/88 ... ok 13/89 ... ok 15/90 ... ok 18/91 ... ok 19/92 ... ok 18/93 ... ok 18/94 ... ok 8/95 ... ok 18/96 ... ok 18/97 ... ok 8/98 ... ok 7/99 ... ok 28/101 ... ok 28/102 ... ok 28/103 ... ok 15/104 ... ok 18/105 ... ok 17/106 ... ok 7/107 ... ok 8/108 ... ok 8/109 ... ok 18/110 ... ok 29/111 ... ok 8/112 ... ok 8/113 ... ok 32/114 ... ok 28/115 ... ok 17/116 ... ok 8/117 ... ok 8/118 ... ok 32/119 ... ok 18/120 ... ok 8/121 ... ok 8/122 ... ok 18/123 ... ok 18/124 ... ok 18/125 ... ok 8/126 ... ok 18/127 ... ok 3/128 ... ok 8/129 ... ok 8/130 ... ok 19/131 ... ok 19/132 ... ok 8/133 ... ok 35/134 ... ok 7/135 ... ok 22/136 ... ok 22/137 ... ok 18/138 ... ok 22/139 ... ok 35/140 ... ok 7/142 ... repository is empty 8/143 ... ok 11/144 ... ok 29/146 ... ok 29/147 ... ok 17/148 ... ok 18/149 ... ok 18/150 ... ok 8/151 ... ok 12/152 ... ok 8/153 ... ok 8/154 ... ok 8/155 ... ok 8/156 ... ok 37/157 ... ok 18/158 ... ok 37/159 ... ok 8/160 ... ok 37/161 ... ok 8/162 ... ok 8/163 ... ok 7/164 ... ok 18/165 ... ok 41/166 ... ok 41/167 ... ok 42/168 ... ok 22/169 ... ok 8/170 ... ok 41/171 ... repository is empty 8/172 ... ok 29/173 ... ok 29/174 ... ok Running /opt/gitlab/embedded/service/gitlab-shell/bin/check Check GitLab API access: OK Redis available via internal API: OK
Access to /var/opt/gitlab/.ssh/authorized_keys: OK gitlab-shell self-check successful
Checking GitLab Shell ... Finished
Checking Sidekiq ...
Running? ... yes Number of Sidekiq processes ... 1
Checking 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: ... 1/2 ... yes 3/6 ... yes 7/16 ... yes 8/17 ... yes 8/18 ... yes 8/19 ... yes 7/20 ... yes 7/21 ... yes 8/22 ... yes 7/23 ... yes 7/26 ... yes 8/27 ... yes 8/28 ... yes 8/29 ... yes 8/30 ... yes 8/31 ... yes 8/32 ... yes 3/33 ... yes 3/35 ... yes 8/36 ... yes 18/39 ... yes 11/40 ... yes 8/41 ... yes 8/42 ... yes 13/43 ... yes 17/44 ... yes 18/45 ... yes 7/46 ... yes 13/47 ... yes 8/48 ... yes 8/49 ... yes 19/54 ... yes 11/55 ... yes 11/56 ... yes 8/57 ... yes 22/60 ... yes 18/64 ... yes 8/74 ... yes 13/75 ... yes 18/76 ... yes 7/77 ... yes 18/78 ... yes 8/79 ... yes 18/80 ... yes 8/81 ... yes 8/82 ... yes 11/83 ... yes 22/84 ... yes 8/85 ... yes 7/86 ... yes 13/87 ... yes 18/88 ... yes 13/89 ... yes 15/90 ... yes 18/91 ... yes 19/92 ... yes 18/93 ... yes 18/94 ... yes 8/95 ... yes 18/96 ... yes 18/97 ... yes 8/98 ... yes 7/99 ... yes 28/101 ... yes 28/102 ... yes 28/103 ... yes 15/104 ... yes 18/105 ... yes 17/106 ... yes 7/107 ... yes 8/108 ... yes 8/109 ... yes 18/110 ... yes 29/111 ... yes 8/112 ... yes 8/113 ... yes 32/114 ... yes 28/115 ... yes 17/116 ... yes 8/117 ... yes 8/118 ... yes 32/119 ... yes 18/120 ... yes 8/121 ... yes 8/122 ... yes 18/123 ... yes 18/124 ... yes 18/125 ... yes 8/126 ... yes 18/127 ... yes 3/128 ... yes 8/129 ... yes 8/130 ... yes 19/131 ... yes 19/132 ... yes 8/133 ... yes 35/134 ... yes 7/135 ... yes 22/136 ... yes 22/137 ... yes 18/138 ... yes 22/139 ... yes 35/140 ... yes 7/142 ... yes 8/143 ... yes 11/144 ... yes 29/146 ... yes 29/147 ... yes 17/148 ... yes 18/149 ... yes 18/150 ... yes 8/151 ... yes 12/152 ... yes 8/153 ... yes 8/154 ... yes 8/155 ... yes 8/156 ... yes 37/157 ... yes 18/158 ... yes 37/159 ... yes 8/160 ... yes 37/161 ... yes 8/162 ... yes 8/163 ... yes 7/164 ... yes 18/165 ... yes 41/166 ... yes 41/167 ... yes 42/168 ... yes 22/169 ... yes 8/170 ... yes 41/171 ... yes 8/172 ... yes 29/173 ... yes 29/174 ... 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: ... 15
Checking GitLab ... Finished
Possible fixes
Nope sorry...