Grzegorz BizonandRobert Speicher 23975e093b Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' ...

Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936

2015-12-07 14:33:36 -05:00

..

commits

Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'

2015-12-07 14:33:36 -05:00

issues

Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'

2015-12-07 14:33:36 -05:00

source

Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'

2015-11-19 11:46:24 -05:00

active_tab.feature

Move Project Members link from Settings to main menu.

2015-06-09 14:45:38 +02:00

archived.feature

Remove tests for un-existing page

2015-03-10 23:34:18 -07:00

create.feature

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

deploy_keys.feature

Don't show duplicate deploy keys. Fixes #1516

2015-05-08 21:32:03 +02:00

fork.feature

Improve fork to namespaces feature

2014-11-14 16:06:39 +02:00

forked_merge_requests.feature

Fix "Project Forked Merge Requests" scenario

2015-06-26 22:41:02 -04:00

graph.feature

Move CI charts to project graphs area

2015-09-23 16:24:46 +02:00

hooks.feature

Enable SSL verification for Webhooks

2015-08-26 15:48:31 +03:00

merge_requests.feature

Display target branch on MR list when it is different from project's default

2015-11-10 09:31:14 +02:00

network_graph.feature

Fix network graph when branch name has single quotes

2015-07-29 23:29:47 -07:00

project.feature

Add tests for last commit info on project home page

2015-10-16 10:10:33 +02:00

redirects.feature

Add in the tests.

2014-07-11 19:53:10 +02:00

service.feature

Hide password in the service settings form

2015-10-02 12:48:57 +03:00

shortcuts.feature

Fix schortcut tests

2015-07-08 17:36:31 +02:00

snippets.feature

fix spinach features to use new button wordings

2015-10-15 17:59:17 +11:00

star.feature

Refactor star btn logic for non-logged in user and fix tests

2015-03-29 18:50:45 -07:00

team_management.feature

Change "Sam" to "Dmitriy" in feature steps

2015-04-23 18:59:57 -04:00

wiki.feature

Fix broken Wiki Page History

2015-09-01 23:29:27 -07:00