summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-12-24 15:58:32 +0000
committerValery Sizov <valery@gitlab.com>2015-12-24 15:58:32 +0000
commite1a47bd1232a1463b8d5d95b8fd624bb969f7de7 (patch)
treed68c3267281664faba516ca5833f4dba158431d3 /features
parent1a23af485cd755738f4051e04132b1eb93fc3fab (diff)
parent355e62eb498de90f91ac129af94d4a0f2ec6b129 (diff)
downloadgitlab-ce-e1a47bd1232a1463b8d5d95b8fd624bb969f7de7.tar.gz
Merge branch 'emoji_picker_frequently_used' into 'master'
Emoji picker: add "frequently used" category depend on !2172 ![Screen_Shot_2015-12-24_at_16.39.04](/uploads/7117173c6f519282054bcb1b7ba248f4/Screen_Shot_2015-12-24_at_16.39.04.png) See merge request !2180
Diffstat (limited to 'features')
-rw-r--r--features/project/issues/award_emoji.feature4
1 files changed, 2 insertions, 2 deletions
diff --git a/features/project/issues/award_emoji.feature b/features/project/issues/award_emoji.feature
index 2126e826ddc..9a06fdc2ee6 100644
--- a/features/project/issues/award_emoji.feature
+++ b/features/project/issues/award_emoji.feature
@@ -26,5 +26,5 @@ Feature: Award Emoji
@javascript
Scenario: I add award emoji using regular comment
- Given I leave comment with a single emoji
- Then I have award added
+ Given I leave comment with a single emoji
+ Then I have award added