diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-08-30 15:15:23 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-08-30 15:15:23 +0000 |
| commit | f35d7d7f6ea04a38da822db902ad24108dfe94a2 (patch) | |
| tree | a561939595656be354abd1db6909872e63c2fe54 /app | |
| parent | f1d9dc81727c84c1114c1cbdc1b87a2a10462420 (diff) | |
| parent | b9d8946395ebe2b0d05e464e6a2af1181c7f1b90 (diff) | |
| download | gitlab-ce-f35d7d7f6ea04a38da822db902ad24108dfe94a2.tar.gz | |
Merge branch '37231-mysql2-error-unknown-column-award_emoji-count-on-master' into 'master'
Resolve "Mysql2::Error: Unknown column 'award_emoji.count' on master"
Closes #37231
See merge request !13926
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 54f78fc8719..59be955599d 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -55,7 +55,7 @@ class AutocompleteController < ApplicationController .limit(AWARD_EMOJI_MAX) .where(user: current_user) .group(:name) - .order(count: :desc, name: :asc) + .order('count_all DESC, name ASC') .count # Transform from hash to array to guarantee json order |