summaryrefslogtreecommitdiff
path: root/app/models/badge.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-10 12:08:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-10 12:08:58 +0000
commit0211553b0cd32ddcd49fbe61fdb318984d15af18 (patch)
treef95d5876dfee2d1ff158f38a676167501e6519db /app/models/badge.rb
parent23ff717a29540bb1d4b0068f164b5f9df99386bf (diff)
downloadgitlab-ce-0211553b0cd32ddcd49fbe61fdb318984d15af18.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/badge.rb')
-rw-r--r--app/models/badge.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/badge.rb b/app/models/badge.rb
index 3400d6d407d..4339d419b48 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -18,7 +18,7 @@ class Badge < ApplicationRecord
# This regex will build the new PLACEHOLDER_REGEX with the new information
PLACEHOLDERS_REGEX = /(#{PLACEHOLDERS.keys.join('|')})/.freeze
- default_scope { order_created_at_asc }
+ default_scope { order_created_at_asc } # rubocop:disable Cop/DefaultScope
scope :order_created_at_asc, -> { reorder(created_at: :asc) }