From 9cf67f72a581d4648b2b02b53403dd4318e4f1e9 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Tue, 1 Dec 2015 12:00:11 +0100
Subject: Add validator for award-emoji note

---
 app/models/note.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/models/note.rb b/app/models/note.rb
index 1c6345e735c..40b46b85da1 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -41,6 +41,7 @@ class Note < ActiveRecord::Base
 
   validates :note, :project, presence: true
   validates :note, uniqueness: { scope: [:author, :noteable_type, :noteable_id] }, if: ->(n) { n.is_award }
+  validates :note, format: { with: /\A[-_+[:alnum:]]*\z/ }, if: -> (n){ n.is_award }
   validates :line_code, format: { with: /\A[a-z0-9]+_\d+_\d+\Z/ }, allow_blank: true
   # Attachments are deprecated and are handled by Markdown uploader
   validates :attachment, file_size: { maximum: :max_attachment_size }
-- 
cgit v1.2.3


From 22d87b74a9de5d603f101699d7a3665db9627037 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Tue, 1 Dec 2015 14:45:24 +0100
Subject: Support award-emoji notes only when it a comment for an issue

---
 app/services/notes/create_service.rb | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index dbff58dfb9c..20a3ba30755 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -5,9 +5,9 @@ module Notes
       note.author = current_user
       note.system = false
 
-      if contains_emoji_only?(params[:note])
+      if award_emoji_note?
         note.is_award = true
-        note.note = emoji_name(params[:note])
+        note.note = emoji_name
       end
 
       if note.save
@@ -34,12 +34,23 @@ module Notes
       note.project.execute_services(note_data, :note_hooks)
     end
 
-    def contains_emoji_only?(note)
-      note =~ /\A:[-_+[:alnum:]]*:\s?\z/
+    private
+
+    def award_emoji_note?
+      # We support award-emojis only in issue discussion
+      issue_comment? && contains_emoji_only?
+    end
+
+    def contains_emoji_only?
+      params[:note] =~ /\A:[-_+[:alnum:]]*:\s?\z/
+    end
+
+    def issue_comment?
+      params[:noteable_type] == 'Issue'
     end
 
-    def emoji_name(note)
-      note.match(/\A:([-_+[:alnum:]]*):\s?/)[1]
+    def emoji_name
+      params[:note].match(/\A:([-_+[:alnum:]]*):\s?/)[1]
     end
   end
 end
-- 
cgit v1.2.3


From ba08811d07cd1804b027b1a37a5278723cdbeb2c Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Wed, 2 Dec 2015 08:48:21 +0100
Subject: Move note emoji-award implementation to note model (feature envy)

---
 app/models/note.rb                   | 33 +++++++++++++++++++++++++++++++++
 app/services/notes/create_service.rb | 24 ------------------------
 2 files changed, 33 insertions(+), 24 deletions(-)

(limited to 'app')

diff --git a/app/models/note.rb b/app/models/note.rb
index 40b46b85da1..8acb2cf7582 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -72,6 +72,7 @@ class Note < ActiveRecord::Base
 
   serialize :st_diff
   before_create :set_diff, if: ->(n) { n.line_code.present? }
+  before_validation :set_award!
 
   class << self
     def discussions_from_notes(notes)
@@ -349,4 +350,36 @@ class Note < ActiveRecord::Base
   def editable?
     !system?
   end
+
+  # Checks if note is an award added from an issue comment.
+  #
+  # If note is an award, this method sets is_award to true,
+  # and changes note content to award-emoji name.
+  #
+  # Awards are only supported for issue comments.
+  #
+  # Method is executed as a before_validation callback.
+  #
+  def set_award!
+    return unless issue_comment? && contains_emoji_only?
+
+    self.is_award = true
+    self.note = award_emoji_name
+  end
+
+  private
+
+  def issue_comment?
+    noteable.kind_of?(Issue)
+  end
+
+  def contains_emoji_only?
+    (note =~ /\A:[-_+[:alnum:]]*:\s?\z/) ? true : false
+  end
+
+  def award_emoji_name
+    return nil unless contains_emoji_only?
+
+    note.match(/\A:([-_+[:alnum:]]*):\s?/)[1]
+  end
 end
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 20a3ba30755..a8486e6a5a1 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -5,11 +5,6 @@ module Notes
       note.author = current_user
       note.system = false
 
-      if award_emoji_note?
-        note.is_award = true
-        note.note = emoji_name
-      end
-
       if note.save
         notification_service.new_note(note)
 
@@ -33,24 +28,5 @@ module Notes
       note.project.execute_hooks(note_data, :note_hooks)
       note.project.execute_services(note_data, :note_hooks)
     end
-
-    private
-
-    def award_emoji_note?
-      # We support award-emojis only in issue discussion
-      issue_comment? && contains_emoji_only?
-    end
-
-    def contains_emoji_only?
-      params[:note] =~ /\A:[-_+[:alnum:]]*:\s?\z/
-    end
-
-    def issue_comment?
-      params[:noteable_type] == 'Issue'
-    end
-
-    def emoji_name
-      params[:note].match(/\A:([-_+[:alnum:]]*):\s?/)[1]
-    end
   end
 end
-- 
cgit v1.2.3


From c92b6e66dc3a5bb1b07d1561fa09e8fd051c1956 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Wed, 2 Dec 2015 09:36:11 +0100
Subject: Scroll to awards after adding emoji-award comment

This makes it more intuitive, as user can see that something actually
happened after adding emoji-only comment in long discussions.
---
 app/assets/javascripts/awards_handler.coffee | 7 ++++++-
 app/assets/javascripts/notes.js.coffee       | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 09b48fe5572..96fd8f8773e 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -88,4 +88,9 @@ class @AwardsHandler
         callback.call()
 
   findEmojiIcon: (emoji) ->
-    $(".icon[data-emoji='" + emoji + "']")
\ No newline at end of file
+    $(".icon[data-emoji='" + emoji + "']")
+
+  scrollToAwards: ->
+    $('body, html').animate({
+      scrollTop: $('.awards').offset().top - 80
+    }, 200)
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 7de7632201d..797234e6d9c 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -122,6 +122,7 @@ class @Notes
 
     if note.award
       awards_handler.addAwardToEmojiBar(note.note, note.emoji_path)
+      awards_handler.scrollToAwards()
 
   ###
   Check if note does not exists on page
-- 
cgit v1.2.3


From bfce5d716835f07b98b6d26ccc121d3ac8322aa9 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Wed, 2 Dec 2015 10:13:29 +0100
Subject: Render json message with errors if note didn't pass validation

---
 app/controllers/projects/notes_controller.rb | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 5ac18446aa7..a7ff5fcd09a 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -131,16 +131,20 @@ class Projects::NotesController < Projects::ApplicationController
   end
 
   def render_note_json(note)
-    render json: {
-      id: note.id,
-      discussion_id: note.discussion_id,
-      html: note_to_html(note),
-      award: note.is_award,
-      emoji_path: note.is_award ? view_context.image_url(::AwardEmoji.path_to_emoji_image(note.note)) : "",
-      note: note.note,
-      discussion_html: note_to_discussion_html(note),
-      discussion_with_diff_html: note_to_discussion_with_diff_html(note)
-    }
+    if note.valid?
+      render json: {
+        id: note.id,
+        discussion_id: note.discussion_id,
+        html: note_to_html(note),
+        award: note.is_award,
+        emoji_path: note.is_award ? view_context.image_url(::AwardEmoji.path_to_emoji_image(note.note)) : "",
+        note: note.note,
+        discussion_html: note_to_discussion_html(note),
+        discussion_with_diff_html: note_to_discussion_with_diff_html(note)
+      }
+    else
+      render json: { invalid: true, errors: note.errors }
+    end
   end
 
   def authorize_admin_note!
-- 
cgit v1.2.3


From a527f5c27ff92d2ee7e2d5e78dc20b6d1d982aa0 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Wed, 2 Dec 2015 10:51:46 +0100
Subject: Notify user when award-emoji comment is invalid

---
 app/assets/javascripts/notes.js.coffee       | 4 ++++
 app/controllers/projects/notes_controller.rb | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 797234e6d9c..af0d62c8495 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -111,6 +111,10 @@ class @Notes
   Note: for rendering inline notes use renderDiscussionNote
   ###
   renderNote: (note) ->
+    unless note.valid
+      alert('You have already used this award emoji !') if note.award
+      return
+
     # render note if it not present in loaded list
     # or skip if rendered
     if @isNewNote(note) && !note.award
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index a7ff5fcd09a..88b949a27ab 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -133,6 +133,7 @@ class Projects::NotesController < Projects::ApplicationController
   def render_note_json(note)
     if note.valid?
       render json: {
+        valid: true,
         id: note.id,
         discussion_id: note.discussion_id,
         html: note_to_html(note),
@@ -143,7 +144,11 @@ class Projects::NotesController < Projects::ApplicationController
         discussion_with_diff_html: note_to_discussion_with_diff_html(note)
       }
     else
-      render json: { invalid: true, errors: note.errors }
+      render json: {
+        valid: false,
+        award: note.is_award,
+        errors: note.errors
+      }
     end
   end
 
-- 
cgit v1.2.3


From 6fc1b948560b9e19ac5c1412dd2deb98987aefe8 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Wed, 2 Dec 2015 18:39:12 +0100
Subject: Show flash message instead of alert when note is invalid

---
 app/assets/javascripts/notes.js.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index af0d62c8495..ea190fa8b76 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -112,7 +112,8 @@ class @Notes
   ###
   renderNote: (note) ->
     unless note.valid
-      alert('You have already used this award emoji !') if note.award
+      if note.award
+        new Flash('You have already used this award emoji !', 'alert')
       return
 
     # render note if it not present in loaded list
-- 
cgit v1.2.3


From 70a076c059482e5c26cb723b722bc865142460ea Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Thu, 3 Dec 2015 08:51:14 +0100
Subject: Add new features to javascript flash message

---
 app/assets/javascripts/flash.js.coffee      | 19 +++++++++++++------
 app/assets/stylesheets/framework/flash.scss | 10 ++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/flash.js.coffee b/app/assets/javascripts/flash.js.coffee
index b39ab0c4475..5e34b49c20d 100644
--- a/app/assets/javascripts/flash.js.coffee
+++ b/app/assets/javascripts/flash.js.coffee
@@ -1,12 +1,19 @@
 class @Flash
   constructor: (message, type)->
-    flash = $(".flash-container")
-    flash.html("")
+    @flash = $(".flash-container")
+    @flash.html("")
 
-    $('<div/>',
+    innerDiv = $('<div/>',
       class: "flash-#{type}",
       text: message
-    ).appendTo(".flash-container")
+    )
+    innerDiv.appendTo(".flash-container")
 
-    flash.click -> $(@).fadeOut()
-    flash.show()
+    @flash.click -> $(@).fadeOut()
+    @flash.show()
+
+  pinToTop: ->
+    @flash.addClass('flash-pinned')
+
+  raise: ->
+    @flash.addClass('flash-raised')
diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss
index 82eb50ad4be..1b723021d76 100644
--- a/app/assets/stylesheets/framework/flash.scss
+++ b/app/assets/stylesheets/framework/flash.scss
@@ -15,3 +15,13 @@
     @extend .alert-danger;
   }
 }
+
+.flash-pinned {
+  position: fixed;
+  top: 80px;
+  width: 80%;
+}
+
+.flash-raised {
+  z-index: 1000;
+}
-- 
cgit v1.2.3


From 554f4684622564fe496acb25cacb2daed3b9f3ac Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Thu, 3 Dec 2015 08:51:37 +0100
Subject: Pin flash message to top if award note is invalid

---
 app/assets/javascripts/notes.js.coffee | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index ea190fa8b76..8eacd05d050 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -113,7 +113,9 @@ class @Notes
   renderNote: (note) ->
     unless note.valid
       if note.award
-        new Flash('You have already used this award emoji !', 'alert')
+        flash = new Flash('You have already used this award emoji !', 'alert')
+        flash.pinToTop()
+        flash.raise()
       return
 
     # render note if it not present in loaded list
-- 
cgit v1.2.3


From f08f921d537c68ec0bbfb8a1ae7e905cded1bbad Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Thu, 3 Dec 2015 12:46:39 +0100
Subject: Support emoji awards also in merge requests

---
 app/models/note.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/models/note.rb b/app/models/note.rb
index 8acb2cf7582..30d15d93fed 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -361,7 +361,7 @@ class Note < ActiveRecord::Base
   # Method is executed as a before_validation callback.
   #
   def set_award!
-    return unless issue_comment? && contains_emoji_only?
+    return unless supports_awards? && contains_emoji_only?
 
     self.is_award = true
     self.note = award_emoji_name
@@ -369,8 +369,9 @@ class Note < ActiveRecord::Base
 
   private
 
-  def issue_comment?
-    noteable.kind_of?(Issue)
+  def supports_awards?
+    noteable.kind_of?(Issue) ||
+      noteable.is_a?(MergeRequest)
   end
 
   def contains_emoji_only?
-- 
cgit v1.2.3


From 7af67f619a9ce3dab0a66560bc57ccf606077779 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Thu, 3 Dec 2015 12:59:44 +0100
Subject: Combine new javascript Flash methods into one

---
 app/assets/javascripts/flash.js.coffee | 7 ++-----
 app/assets/javascripts/notes.js.coffee | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/flash.js.coffee b/app/assets/javascripts/flash.js.coffee
index 5e34b49c20d..9b59d4e57f7 100644
--- a/app/assets/javascripts/flash.js.coffee
+++ b/app/assets/javascripts/flash.js.coffee
@@ -12,8 +12,5 @@ class @Flash
     @flash.click -> $(@).fadeOut()
     @flash.show()
 
-  pinToTop: ->
-    @flash.addClass('flash-pinned')
-
-  raise: ->
-    @flash.addClass('flash-raised')
+  pin: ->
+    @flash.addClass('flash-pinned flash-raised')
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 8eacd05d050..4f559e86378 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -114,8 +114,7 @@ class @Notes
     unless note.valid
       if note.award
         flash = new Flash('You have already used this award emoji !', 'alert')
-        flash.pinToTop()
-        flash.raise()
+        flash.pin()
       return
 
     # render note if it not present in loaded list
-- 
cgit v1.2.3


From 83d8185f5afee7553bf5756ce61b6b855d48c1e5 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Thu, 3 Dec 2015 13:03:50 +0100
Subject: Make method `supports_award?` public in `Note`

---
 app/models/note.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/models/note.rb b/app/models/note.rb
index 30d15d93fed..03640be7c93 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -367,13 +367,13 @@ class Note < ActiveRecord::Base
     self.note = award_emoji_name
   end
 
-  private
-
   def supports_awards?
     noteable.kind_of?(Issue) ||
       noteable.is_a?(MergeRequest)
   end
 
+  private
+
   def contains_emoji_only?
     (note =~ /\A:[-_+[:alnum:]]*:\s?\z/) ? true : false
   end
-- 
cgit v1.2.3


From 176d6e2a8ff97a33d533495aa3a2775dbb87284f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Sat, 5 Dec 2015 22:09:52 +0100
Subject: Refactor note awards to reuse `emoji_pattern` and improve validator

---
 app/models/note.rb | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'app')

diff --git a/app/models/note.rb b/app/models/note.rb
index 03640be7c93..2bee19479c5 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -39,9 +39,11 @@ class Note < ActiveRecord::Base
   delegate :name, to: :project, prefix: true
   delegate :name, :email, to: :author, prefix: true
 
+  before_validation :set_award!
+
   validates :note, :project, presence: true
   validates :note, uniqueness: { scope: [:author, :noteable_type, :noteable_id] }, if: ->(n) { n.is_award }
-  validates :note, format: { with: /\A[-_+[:alnum:]]*\z/ }, if: -> (n){ n.is_award }
+  validates :note, inclusion: { in: Emoji.emojis_names }, if: ->(n) { n.is_award }
   validates :line_code, format: { with: /\A[a-z0-9]+_\d+_\d+\Z/ }, allow_blank: true
   # Attachments are deprecated and are handled by Markdown uploader
   validates :attachment, file_size: { maximum: :max_attachment_size }
@@ -72,7 +74,6 @@ class Note < ActiveRecord::Base
 
   serialize :st_diff
   before_create :set_diff, if: ->(n) { n.line_code.present? }
-  before_validation :set_award!
 
   class << self
     def discussions_from_notes(notes)
@@ -351,36 +352,31 @@ class Note < ActiveRecord::Base
     !system?
   end
 
-  # Checks if note is an award added from an issue comment.
+  # Checks if note is an award added as a comment
   #
-  # If note is an award, this method sets is_award to true,
-  # and changes note content to award-emoji name.
-  #
-  # Awards are only supported for issue comments.
+  # If note is an award, this method sets is_award to true
+  #   and changes content of the note to award name.
   #
   # Method is executed as a before_validation callback.
   #
   def set_award!
-    return unless supports_awards? && contains_emoji_only?
-
+    return unless awards_supported? && contains_emoji_only?
     self.is_award = true
     self.note = award_emoji_name
   end
 
-  def supports_awards?
-    noteable.kind_of?(Issue) ||
-      noteable.is_a?(MergeRequest)
-  end
-
   private
 
+  def awards_supported?
+    noteable.kind_of?(Issue) || noteable.is_a?(MergeRequest)
+  end
+
   def contains_emoji_only?
-    (note =~ /\A:[-_+[:alnum:]]*:\s?\z/) ? true : false
+    emoji_only_pattern = /\A#{Gitlab::Markdown::EmojiFilter.emoji_pattern}\s?\Z/
+    (note =~ emoji_only_pattern) ? true : false
   end
 
   def award_emoji_name
-    return nil unless contains_emoji_only?
-
-    note.match(/\A:([-_+[:alnum:]]*):\s?/)[1]
+    note.match(Gitlab::Markdown::EmojiFilter.emoji_pattern)[1]
   end
 end
-- 
cgit v1.2.3


From bfe91b692a89f7a5ee8a0b044fabf5ec397b2904 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Sat, 5 Dec 2015 22:18:13 +0100
Subject: Remove space before exclamation mark in award alert

[ci skip]
---
 app/assets/javascripts/notes.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 4f559e86378..dd6cbcfc70b 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -113,7 +113,7 @@ class @Notes
   renderNote: (note) ->
     unless note.valid
       if note.award
-        flash = new Flash('You have already used this award emoji !', 'alert')
+        flash = new Flash('You have already used this award emoji!', 'alert')
         flash.pin()
       return
 
-- 
cgit v1.2.3


From 893d08c0dc6a1eba14db7694636707f30b28a7f4 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Mon, 7 Dec 2015 11:00:03 +0100
Subject: Simplify `contains_emoji_only?` method in `Note`

---
 app/models/note.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/models/note.rb b/app/models/note.rb
index 2bee19479c5..239a0f77f8e 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -372,8 +372,7 @@ class Note < ActiveRecord::Base
   end
 
   def contains_emoji_only?
-    emoji_only_pattern = /\A#{Gitlab::Markdown::EmojiFilter.emoji_pattern}\s?\Z/
-    (note =~ emoji_only_pattern) ? true : false
+    note =~ /\A#{Gitlab::Markdown::EmojiFilter.emoji_pattern}\s?\Z/
   end
 
   def award_emoji_name
-- 
cgit v1.2.3