Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness✨ Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
Showing
... | @@ -204,7 +204,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' | ... | @@ -204,7 +204,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' |
gem 'addressable', '~> 2.3.8' | gem 'addressable', '~> 2.3.8' | ||
gem 'bootstrap-sass', '~> 3.3.0' | gem 'bootstrap-sass', '~> 3.3.0' | ||
gem 'font-awesome-rails', '~> 4.2' | gem 'font-awesome-rails', '~> 4.2' | ||
gem 'gitlab_emoji', '~> 0.2.0' | gem 'gitlab_emoji', '~> 0.3.0' | ||
gem 'gon', '~> 6.0.1' | gem 'gon', '~> 6.0.1' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 4.0.0' | gem 'jquery-rails', '~> 4.0.0' | ||
... | ... |
![app/assets/images/emoji.png](https://lab.nexedi.com/jerome/gitlab-ce/-/raw/cb0b7de48267abee85d39571ae55a0e988cc21eb/app/assets/images/emoji.png)
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.