Currently on our gitlab 8.4.0 installation we are observing some issues 
with merges where we get a 500 Intenal error on Merge Creation. 

On production log we see the following:

Completed 500 Internal Server Error in 735ms (ActiveRecord: 30.8ms)

ActionView::Template::Error (Revspec 
'dc5cfbd0de8522ad9dd0682fd6d09023bce23f68' not found.):
    16: .files
    17:   - diff_files.each_with_index do |diff_file, index|
    18:     - diff_commit = commit_for_diff(diff_file)
    19:     - blob = project.repository.blob_for_diff(diff_commit, 
diff_file)
    20:     - next unless blob
    21:
    22:     = render 'projects/diffs/file', i: index, project: project,
  app/models/repository.rb:266:in `method_missing'
  app/models/repository.rb:278:in `blob_at'
  app/models/repository.rb:437:in `blob_for_diff'
  app/views/projects/diffs/_diffs.html.haml:19:in `block in 
_app_views_projects_diffs__diffs_html_haml__3428648215439562048_61492340'
  app/views/projects/diffs/_diffs.html.haml:17:in `each'
  app/views/projects/diffs/_diffs.html.haml:17:in `each_with_index'
  app/views/projects/diffs/_diffs.html.haml:17:in 
`_app_views_projects_diffs__diffs_html_haml__3428648215439562048_61492340'
  app/views/projects/merge_requests/_new_submit.html.haml:41:in 
`_app_views_projects_merge_requests__new_submit_html_haml__3169564002061583866_75906780'
  app/views/projects/merge_requests/new.html.haml:5:in 
`_app_views_projects_merge_requests_new_html_haml___3179397449454046090_76332680'



We are running the following versions:

GitLab 8.4.0

GitLab Shell 2.6.10

GitLab API v3

Git 2.6.2

Ruby 2.1.8p440

Rails 4.2.4

-- 
You received this message because you are subscribed to the Google Groups 
"GitLab" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to gitlabhq+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/gitlabhq/61401e8e-7f3f-41a6-99f6-c5f04b19955a%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to