diff options
| author | Andrew Smith <espadav8@gmail.com> | 2016-08-30 00:01:00 +1000 |
|---|---|---|
| committer | Andrew Smith <espadav8@gmail.com> | 2016-09-01 08:40:10 +1000 |
| commit | e71df3cdd20d5c9bcf4ecc64771a1d88babfddf8 (patch) | |
| tree | 5e7d5c7cdcc14391d7d1c38f67a64b07ea1dc8e0 | |
| parent | 2db570e92cdff257fc45cfac7e453a4ddb1bfa81 (diff) | |
| download | gitlab-ce-e71df3cdd20d5c9bcf4ecc64771a1d88babfddf8.tar.gz | |
Order award tooltips by their created_at date
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/concerns/awardable.rb | 2 | ||||
| -rw-r--r-- | spec/models/concerns/awardable_spec.rb | 10 |
3 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index d06fc24d40a..eeb37dbc55a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ v 8.12.0 (unreleased) - Fix branch title trailing space on hover (ClemMakesApps) - Award emoji tooltips containing more than 10 usernames are now truncated !4780 (jlogandavison) - Fix duplicate "me" in award emoji tooltip !5218 (jlogandavison) + - Order award emoji tooltips in order they were added (EspadaV8) - Fix spacing and vertical alignment on build status icon on commits page (ClemMakesApps) - Update merge_requests.md with a simpler way to check out a merge request. !5944 - Fix button missing type (ClemMakesApps) diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb index 800a16ab246..e6feaf7df4f 100644 --- a/app/models/concerns/awardable.rb +++ b/app/models/concerns/awardable.rb @@ -2,7 +2,7 @@ module Awardable extend ActiveSupport::Concern included do - has_many :award_emoji, -> { includes(:user) }, as: :awardable, dependent: :destroy + has_many :award_emoji, -> { includes(:user).order(:id) }, as: :awardable, dependent: :destroy if self < Participable # By default we always load award_emoji user association diff --git a/spec/models/concerns/awardable_spec.rb b/spec/models/concerns/awardable_spec.rb index a371c4a18a9..de791abdf3d 100644 --- a/spec/models/concerns/awardable_spec.rb +++ b/spec/models/concerns/awardable_spec.rb @@ -45,4 +45,14 @@ describe Issue, "Awardable" do expect { issue.toggle_award_emoji("thumbsdown", award_emoji.user) }.to change { AwardEmoji.count }.by(-1) end end + + describe 'querying award_emoji on an Awardable' do + let(:issue) { create(:issue) } + + it 'sorts in ascending fashion' do + create_list(:award_emoji, 3, awardable: issue) + + expect(issue.award_emoji).to eq issue.award_emoji.sort_by(&:id) + end + end end |