Robert Speicher a27212ab90 Merge branch 'cs-gemojione-3' into 'master' ... Upgrade gemojione to 3.0.0 Upgrades gemojione to 3.0.0, see the Changelog: b98aa8b07e/CHANGELOG.md (v300-2016-07-12) [Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) 🎉 This update has new emoji and more sensical categories. See merge request !5237		2016-07-18 23:57:13 +00:00
..
assets	Merge branch 'cs-gemojione-3' into 'master'	2016-07-18 23:57:13 +00:00
controllers	Merge branch 'caironoleto/gitlab-ce-cn-issue-19747'	2016-07-18 15:44:58 -06:00
finders	Merge branch 'approval-required-todo' into 'master'	2016-07-12 19:50:33 +00:00
helpers	Merge branch '19820-safer-diffs' into 'master'	2016-07-18 21:28:24 +00:00
mailers	Allow build email service to be tested	2016-07-15 20:38:27 -03:00
models	Merge branch 'issue_13343' into 'master'	2016-07-18 21:38:22 +00:00
services	Merge branch 'caironoleto/gitlab-ce-cn-issue-19747'	2016-07-18 15:44:58 -06:00
uploaders	Enable Style/SpaceAfterComma Rubocop cop	2016-06-29 15:23:44 +02:00
validators	refactor url validator to use sanitizer for check	2016-07-01 09:02:45 +02:00
views	Merge branch 'cs-gemojione-3' into 'master'	2016-07-18 23:57:13 +00:00
workers	limit project expor retry to only 3	2016-07-18 09:23:41 +02:00