gitlab-org--gitlab-foss/app
Stan Hu 5cb488e8a1 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.

Closes #21119, #21128
2016-08-20 09:57:20 -07:00
..
assets Merge branch '581-ee-backport-branch-permissions' into 'master' 2016-08-20 01:36:01 +00:00
controllers Merge branch 'issue_18135' into 'master' 2016-08-19 23:06:30 +00:00
finders Merge branch 'issue_18135' into 'master' 2016-08-19 23:06:30 +00:00
helpers Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' 2016-08-19 20:38:44 +00:00
mailers Merge branch 'master' into diff-line-comment-vuejs 2016-08-18 09:21:40 -06:00
models Fix Error 500 resulting when loading network graph 2016-08-20 09:57:20 -07:00
services Merge branch 'expiration-date-on-memberships' into 'master' 2016-08-19 17:08:03 +00:00
uploaders Remove magic comments from Ruby files (!5456) 2016-07-24 07:08:45 +02:00
validators
views Merge branch '581-ee-backport-branch-permissions' into 'master' 2016-08-20 01:36:01 +00:00
workers Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master' 2016-08-19 18:16:55 +00:00