diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-03 15:20:11 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-03 15:20:11 +0200 |
| commit | 9d491712cfe33286329524fb39dc5bf8e4c8affd (patch) | |
| tree | 0e99ae15e613d5971ba9e7c7ffcdd51e37a2f725 /app/models/project_snippet.rb | |
| parent | fab695461afbc4d03fbbf8cfbf9c5d90760ce752 (diff) | |
| parent | ca3c5c295ed653b483fe81c3918ffe60f46666b9 (diff) | |
| download | gitlab-ce-awardables.tar.gz | |
Merge branch 'master' into awardablesawardables
Diffstat (limited to 'app/models/project_snippet.rb')
| -rw-r--r-- | app/models/project_snippet.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project_snippet.rb b/app/models/project_snippet.rb index 5fba6baa204..25b5d777641 100644 --- a/app/models/project_snippet.rb +++ b/app/models/project_snippet.rb @@ -7,5 +7,6 @@ class ProjectSnippet < Snippet # Scopes scope :fresh, -> { order("created_at DESC") } - participant :author, :notes + participant :author + participant :notes_with_associations end |