diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-09-09 11:06:35 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-09-09 11:06:35 +0300 |
| commit | 3d6fed54f0dc551d8c7ba9a03f4dfbd2203552b5 (patch) | |
| tree | 8a8a3c2f57c64cbbf8918ddce3b202a21bf8a38e /Gemfile.lock | |
| parent | 308e65c0d33583b7450f29822523051a4da2257e (diff) | |
| download | gitlab-ce-3d6fed54f0dc551d8c7ba9a03f4dfbd2203552b5.tar.gz | |
fix Gemfile
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 97e4c258615..1c64a622cd2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -345,7 +345,6 @@ GEM html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) - htmlentities (4.3.4) http-cookie (1.0.2) domain_name (~> 0.5) http_parser.rb (0.5.3) @@ -562,6 +561,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) + rinku (1.7.3) rotp (1.6.1) rouge (1.7.7) rqrcode (0.7.0) @@ -725,8 +725,6 @@ GEM eventmachine (>= 0.12.8) http_parser.rb (~> 0.5.1) simple_oauth (~> 0.1.4) - twitter-text (1.12.0) - unf (~> 0.1.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.3.3) @@ -762,12 +760,10 @@ GEM whenever (0.8.4) activesupport (>= 2.3.4) chronic (>= 0.6.3) - wikicloth (0.8.3) + wikicloth (0.8.1) builder expression_parser - htmlentities - nokogiri - twitter-text + rinku xpath (2.0.0) nokogiri (~> 1.3) @@ -924,7 +920,7 @@ DEPENDENCIES virtus (~> 1.0.1) webmock (~> 1.21.0) whenever (~> 0.8.4) - wikicloth (~> 0.8.1) + wikicloth (= 0.8.1) BUNDLED WITH 1.10.6 |