1. 22 Aug, 2016 30 commits
  2. 21 Aug, 2016 8 commits
  3. 20 Aug, 2016 2 commits
    • Rubén Dávila Santos's avatar
      Merge branch 'fix-network-graph-error-500' into 'master' · b8728c0b
      Rubén Dávila Santos authored
      Fix Error 500 resulting when loading network graph
      
      `discussion_id` may not be present when the SELECT call for notes does not include this attribute. Don't attempt to set the discussion ID unless the model contains the attribute:
      
      ```ruby
      irb(main):019:0> notes[0]
        Note Load (10.3ms)  SELECT notes.commit_id, count(notes.id) as note_count FROM "notes" WHERE "notes"."project_id" = $1 AND (noteable_type = 'Commit') GROUP BY notes.commit_id  [["project_id", 13083]]
      ActiveModel::MissingAttributeError: missing attribute: discussion_id
      ```
      
      Closes #21119, #21128
      
      See merge request !5922
      b8728c0b
    • Stan Hu's avatar
      Fix Error 500 resulting when loading network graph · 5cb488e8
      Stan Hu authored
      `discussion_id` may not be present when the SELECT call for notes
      does not include this attribute. Don't attempt to set the discussion ID
      unless the model contains the attribute.
      
      Closes #21119, #21128
      5cb488e8