diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-24 15:07:34 +1000 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-24 15:07:34 +1000 |
| commit | 1b9c1ac3adb3d65e51f38e37c4705d46c5618f88 (patch) | |
| tree | b724afd0596dd658f7ef7baddf9411ff3e599f7d /app/models/commit.rb | |
| parent | 392c411bdc16386ef42c86afaf8c4d8e4cddb955 (diff) | |
| parent | 2e00c1a72afc4b7388bb46bd6d58608e2ae61899 (diff) | |
| download | gitlab-ce-1b9c1ac3adb3d65e51f38e37c4705d46c5618f88.tar.gz | |
Merge branch 'master' into 10244-add-project-ci-cd-settings
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index de860df4b9c..9750e9298ec 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -248,7 +248,7 @@ class Commit end def notes_with_associations - notes.includes(:author) + notes.includes(:author, :award_emoji) end def merge_requests |