diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 13:43:06 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 13:43:06 -0500 |
| commit | cefeeaea3364c52afc8077c6eaa8914a4bb27852 (patch) | |
| tree | 03c1100e2636510f89982b4a3473e868a3745eab /app/models/commit.rb | |
| parent | 59d6161e1ea5f4650fe45a0f6bd2e45bb061f6e1 (diff) | |
| parent | b1e9d98a29605daf7ccdd0e324dd399fdebfee41 (diff) | |
| download | gitlab-ce-cefeeaea3364c52afc8077c6eaa8914a4bb27852.tar.gz | |
Merge branch 'master' into bootstrap4
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 |