Streamline the "Report button"

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.

2 files changed, 3 insertions, 4 deletions

diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index 07c87a7fe87..89b3116b9f2 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -11,11 +11,11 @@
 #
 
 class AbuseReport < ActiveRecord::Base
-  belongs_to :reporter, class_name: "User"
+  belongs_to :reporter, class_name: 'User'
   belongs_to :user
 
   validates :reporter, presence: true
   validates :user, presence: true
   validates :message, presence: true
-  validates :user_id, uniqueness: { scope: :reporter_id }
+  validates :user_id, uniqueness: true
 end
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
 
 
   #