Robert Speicher aefb8a1741 Merge branch 'update-gemoji' into 'master' ...

Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione

- No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem?
- Fixes the Rake task since it broke after all the AwardEmoji changes.
- Update gemojione to 2.6.1.

Spring Update changes! http://emojione.com/releases/#2.2.0

See merge request !4919

2016-07-05 17:08:35 +00:00

..

api

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

assets

…

backup

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

banzai

Merge branch 'update-gemoji' into 'master'

2016-07-05 17:08:35 +00:00

ci

Merge branch 'refactor/ci-config-move-global-entries' into 'master'

2016-07-05 08:37:16 +00:00

container_registry

Show proper image ID on registry page

2016-06-21 13:08:10 +02:00

gitlab

Merge branch 'update-gemoji' into 'master'

2016-07-05 17:08:35 +00:00

json_web_token

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

omni_auth

Fix signin with OmniAuth providers

2015-12-08 14:58:15 +01:00

rouge/formatters

Remove custom Lexer. #3945 [ci skip]

2016-01-08 15:20:48 -05:00

support

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

tasks

Merge branch 'update-gemoji' into 'master'

2016-07-05 17:08:35 +00:00

banzai.rb

Move pre_process into render_result

2016-06-21 17:39:01 +02:00

disable_email_interceptor.rb

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

event_filter.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

extracts_path.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

file_size_validator.rb

Get rid of more requires, which causes warnings when code is reloaded

2016-04-19 11:48:10 +02:00

file_streamer.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

gitlab.rb

Update Gitlab.com? to support staging

2016-06-27 15:10:36 -04:00

gt_one_coercion.rb

diff unfold

2014-08-14 15:48:14 +04:00

repository_cache.rb

Store commit count in project table

2015-07-17 15:22:56 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

unfold_form.rb

Gitlab Issue 707: Indent unfolded code 1 character

2015-07-22 09:58:17 -04:00

uploaded_file.rb

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

version_check.rb

Update version check images to use SVG

2016-01-05 14:35:29 -05:00