summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-11 16:05:01 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-11 16:05:01 -0700
commitd2d709a252ec4c26894b269a03df871fe51e8b82 (patch)
tree6675f1bcdfbfd7e958cd00d9fe29a48abafd51c0 /Gemfile
parent88e4aed9df812eee9af2f27a975eeac894580042 (diff)
downloadgitlab-ce-d2d709a252ec4c26894b269a03df871fe51e8b82.tar.gz
Update html-pipeline and emoji
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 462c932584d..506dedddb85 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,7 @@ gem "six"
gem "seed-fu"
# Markup pipeline for GitLab
-gem 'html-pipeline-gitlab', '~> 0.1.0'
+gem 'html-pipeline-gitlab', '~> 0.1'
# Markdown to HTML
gem "github-markup"
@@ -194,7 +194,7 @@ gem "jquery-scrollto-rails"
gem "raphael-rails", "~> 2.1.2"
gem 'bootstrap-sass', '~> 3.0'
gem "font-awesome-rails", '~> 4.2'
-gem "gitlab_emoji", "~> 0.0.1.1"
+gem "gitlab_emoji", "~> 0.1"
gem "gon", '~> 5.0.0'
gem 'nprogress-rails'
gem 'request_store'