diff options
| author | Stefan Tatschner <stefan@sevenbyte.org> | 2014-12-03 14:50:06 +0100 |
|---|---|---|
| committer | Stefan Tatschner <stefan@sevenbyte.org> | 2015-01-15 13:13:54 +0100 |
| commit | 377ae460056bb2a4e5824c4f7a3bbcb481e3e38b (patch) | |
| tree | cf67bd87f53d8eaff0cab8283bd0c5799e10c858 /Gemfile.lock | |
| parent | 1e0f36b42a7e8fe8a4549b31233262fedfda742c (diff) | |
| download | gitlab-ce-377ae460056bb2a4e5824c4f7a3bbcb481e3e38b.tar.gz | |
Updated gollum-libs
I did this commit in an earlier revision of my pull request. As
reverting this commit later caused failing tests I decided to
include it again.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c6aa35a3917..b7ede5200b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,13 +166,14 @@ GEM rugged (~> 0.19) gherkin-ruby (0.3.1) racc - github-markup (1.1.0) + github-markup (1.3.1) + posix-spawn (~> 0.3.8) gitlab-flowdock-git-hook (0.4.2.2) gitlab-grit (>= 2.4.1) multi_json gitlab-grack (2.0.0.pre) rack (~> 1.5.1) - gitlab-grit (2.6.12) + gitlab-grit (2.7.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (~> 1.15) @@ -194,11 +195,13 @@ GEM omniauth (~> 1.0) pyu-ruby-sasl (~> 0.0.3.1) rubyntlm (~> 0.3) - gollum-lib (3.0.0) - github-markup (~> 1.1.0) - gitlab-grit (~> 2.6.5) - nokogiri (~> 1.6.1) - rouge (~> 1.3.3) + gollum-grit_adapter (0.1.0) + gitlab-grit (~> 2.7.1) + gollum-lib (4.0.0) + github-markup (~> 1.3.1) + gollum-grit_adapter (~> 0.1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.7.4) sanitize (~> 2.1.0) stringex (~> 2.5.1) gon (5.0.1) @@ -296,7 +299,7 @@ GEM treetop (~> 1.4.8) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.6.0) + mini_portile (0.6.1) minitest (5.3.5) mousetrap-rails (1.4.6) multi_json (1.10.1) @@ -308,8 +311,8 @@ GEM net-ssh (>= 2.6.5) net-ssh (2.8.0) newrelic_rpm (3.9.4.245) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) nprogress-rails (0.1.2.3) oauth (0.4.7) oauth2 (0.8.1) @@ -445,7 +448,7 @@ GEM rest-client (1.6.7) mime-types (>= 1.16) rinku (1.7.3) - rouge (1.3.3) + rouge (1.7.4) rspec (2.14.1) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) @@ -536,7 +539,7 @@ GEM sprockets (~> 2.8) stamp (0.5.0) state_machine (1.2.0) - stringex (2.5.1) + stringex (2.5.2) temple (0.6.7) term-ansicolor (1.2.2) tins (~> 0.8) @@ -651,7 +654,7 @@ DEPENDENCIES gitlab_git (= 7.0.0.rc14) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) - gollum-lib (~> 3.0.0) + gollum-lib (~> 4.0.0) gon (~> 5.0.0) grape (~> 0.6.1) grape-entity (~> 0.4.2) |