summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-11 22:43:58 +0200
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-11 22:43:58 +0200
commit4558b5b9fe9f648903ad0dc01089e6118fe0af34 (patch)
tree36903f41d1f773de3c8fc69592b714b8d9390e0f /app/models/user.rb
parent2f0d89ecff652418a8323990248b681a91f8e05b (diff)
downloadgitlab-ce-4558b5b9fe9f648903ad0dc01089e6118fe0af34.tar.gz
Incorporate feedback
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 5ca53e7c64a..52847212619 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -79,7 +79,7 @@ class User < ActiveRecord::Base
has_many :builds, dependent: :nullify, class_name: 'Ci::Build'
has_many :todos, dependent: :destroy
has_many :notification_settings, dependent: :destroy
- has_many :award_emoji, as: :awardable, dependent: :destroy
+ has_many :award_emoji, as: :awardable, dependent: :destroy
#
# Validations