diff options
| author | Rémy Coutable <remy@rymai.me> | 2015-09-29 18:08:55 +0200 |
|---|---|---|
| committer | rymai <remy@rymai.me> | 2015-09-29 21:47:01 +0200 |
| commit | ea72d53ec083676ee1171e97c0869132f360d0c9 (patch) | |
| tree | d512e83b668cf9223bab25c5f5dd6b715a82b204 /app/models/user.rb | |
| parent | 5f95a5e070c76c582a2b394377b0f350f4b1cff9 (diff) | |
| download | gitlab-ce-ea72d53ec083676ee1171e97c0869132f360d0c9.tar.gz | |
Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reported
This simplifies the "Report button" to not use open a dropdown and
adds a tooltip on this button.
This also removes an extra spec and adds missing specs.
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index a3b149ff992..9ea7cabff15 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -97,9 +97,7 @@ class User < ActiveRecord::Base # Namespace for personal projects has_one :namespace, -> { where type: nil }, dependent: :destroy, foreign_key: :owner_id, class_name: "Namespace" - # Profile - has_one :abuse_report, dependent: :destroy has_many :keys, dependent: :destroy has_many :emails, dependent: :destroy has_many :identities, dependent: :destroy, autosave: true @@ -131,6 +129,7 @@ class User < ActiveRecord::Base has_many :assigned_issues, dependent: :destroy, foreign_key: :assignee_id, class_name: "Issue" has_many :assigned_merge_requests, dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest" has_many :oauth_applications, class_name: 'Doorkeeper::Application', as: :owner, dependent: :destroy + has_one :abuse_report, dependent: :destroy # |