-
- Downloads
There was a problem fetching the pipeline summary.
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
No related branches found
No related tags found
Pipeline #
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 2 additions, 4 deletionsGemfile.lock
- app/assets/images/emoji.png 0 additions, 0 deletionsapp/assets/images/emoji.png
- app/assets/images/emoji@2x.png 0 additions, 0 deletionsapp/assets/images/emoji@2x.png
- app/helpers/issues_helper.rb 1 addition, 1 deletionapp/helpers/issues_helper.rb
- app/models/award_emoji.rb 1 addition, 1 deletionapp/models/award_emoji.rb
- fixtures/emojis/digests.json 2039 additions, 2039 deletionsfixtures/emojis/digests.json
- lib/banzai/filter/emoji_filter.rb 2 additions, 2 deletionslib/banzai/filter/emoji_filter.rb
- lib/gitlab/emoji.rb 21 additions, 0 deletionslib/gitlab/emoji.rb
- lib/tasks/gemojione.rake 1 addition, 1 deletionlib/tasks/gemojione.rake
Loading
Please register or sign in to comment