diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-12 15:34:00 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-12 15:34:00 -0500 |
| commit | f9bf87bbe812a9ea183f1746c0d7bd82cc8423f4 (patch) | |
| tree | 9d0fb8f0716ba3b45ae292fcb971d34791ea9a12 | |
| parent | 65c81466c4548b8e3ebd571dcf48202769b5225b (diff) | |
| download | gitlab-ce-f9bf87bbe812a9ea183f1746c0d7bd82cc8423f4.tar.gz | |
Update gitlab_emoji to ~> 0.3.0
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -204,7 +204,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' gem 'font-awesome-rails', '~> 4.2' -gem 'gitlab_emoji', '~> 0.2.0' +gem 'gitlab_emoji', '~> 0.3.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-rails', '~> 4.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 98a36724fe0..c85a8afb9a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,7 +336,7 @@ GEM ruby-progressbar (~> 1.4) gemnasium-gitlab-service (0.2.6) rugged (~> 0.21) - gemojione (2.1.1) + gemojione (2.2.1) json get_process_mem (0.2.0) gherkin-ruby (0.3.2) @@ -355,8 +355,8 @@ GEM diff-lcs (~> 1.1) mime-types (~> 1.15) posix-spawn (~> 0.3) - gitlab_emoji (0.2.0) - gemojione (~> 2.1) + gitlab_emoji (0.3.1) + gemojione (~> 2.2, >= 2.2.1) gitlab_git (8.1.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -931,7 +931,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_emoji (~> 0.2.0) + gitlab_emoji (~> 0.3.0) gitlab_git (~> 8.1) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) |