diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-11 16:05:01 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-11 16:05:01 -0700 |
| commit | d2d709a252ec4c26894b269a03df871fe51e8b82 (patch) | |
| tree | 6675f1bcdfbfd7e958cd00d9fe29a48abafd51c0 /Gemfile.lock | |
| parent | 88e4aed9df812eee9af2f27a975eeac894580042 (diff) | |
| download | gitlab-ce-d2d709a252ec4c26894b269a03df871fe51e8b82.tar.gz | |
Update html-pipeline and emoji
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cca8f59ac28..32bbfbdc2de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,8 +144,6 @@ GEM email_spec (1.5.0) launchy (~> 2.1) mail (~> 2.2) - emoji (1.0.1) - json enumerize (0.7.0) activesupport (>= 3.2) equalizer (0.0.8) @@ -193,6 +191,8 @@ GEM formatador (0.2.4) gemnasium-gitlab-service (0.2.5) rugged (~> 0.21) + gemojione (2.0.0) + json gherkin-ruby (0.3.1) racc github-markup (1.3.1) @@ -211,8 +211,8 @@ GEM charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) - gitlab_emoji (0.0.1.1) - emoji (~> 1.0.1) + gitlab_emoji (0.1.0) + gemojione (~> 2.0) gitlab_git (7.0.1) activesupport (~> 4.0) charlock_holmes (~> 0.6) @@ -278,10 +278,11 @@ GEM html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) - html-pipeline-gitlab (0.1.5) + html-pipeline-gitlab (0.2.0) actionpack (~> 4) - gitlab_emoji (~> 0.0.1) + gitlab_emoji (~> 0.1) html-pipeline (~> 1.11.0) + mime-types sanitize (~> 2.1) http_parser.rb (0.5.3) httparty (0.13.0) @@ -707,7 +708,7 @@ DEPENDENCIES gitlab-flowdock-git-hook (~> 0.4.2) gitlab-grack (~> 2.0.0.rc2) gitlab-linguist (~> 3.0.1) - gitlab_emoji (~> 0.0.1.1) + gitlab_emoji (~> 0.1) gitlab_git (= 7.0.1) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) @@ -720,7 +721,7 @@ DEPENDENCIES guard-spinach haml-rails hipchat (~> 1.4.0) - html-pipeline-gitlab (~> 0.1.0) + html-pipeline-gitlab (~> 0.1) httparty jasmine (= 2.0.2) jquery-atwho-rails (~> 0.3.3) |