diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-10-03 05:44:58 +0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-10-13 13:45:05 +0200 |
| commit | 0eb5b0a08af7ebe68d515a68e2a94b3d0213393f (patch) | |
| tree | 83682bc4ccf7c01ca146dc32088aa0b6f1946d15 | |
| parent | 8ca0387fe5caeb09f02273d96ed3e6295b02d468 (diff) | |
| download | gitlab-ce-0eb5b0a08af7ebe68d515a68e2a94b3d0213393f.tar.gz | |
Use forked github-markup gem to enable python3 support with omnibus
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 9 insertions, 3 deletions
@@ -101,7 +101,7 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie' -gem 'github-markup', '~> 1.4' +gem 'github-markup', '~> 1.4', git: 'https://github.com/brodock/github-markup.git', branch: 'python3-fix' gem 'redcarpet', '~> 3.3.3' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~>3.6' diff --git a/Gemfile.lock b/Gemfile.lock index 067908af3fb..dde92fff044 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/brodock/github-markup.git + revision: 62ff5993081920ad75016f2b87019dd14e3af137 + branch: python3-fix + specs: + github-markup (1.4.0) + GEM remote: https://rubygems.org/ specs: @@ -272,7 +279,6 @@ GEM escape_utils (~> 1.1.0) mime-types (>= 1.19) rugged (>= 0.23.0b) - github-markup (1.4.0) gitlab-flowdock-git-hook (1.0.1) flowdock (~> 0.7) gitlab-grit (>= 2.4.1) @@ -864,7 +870,7 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.0) github-linguist (~> 4.7.0) - github-markup (~> 1.4) + github-markup (~> 1.4)! gitlab-flowdock-git-hook (~> 1.0.1) gitlab_git (~> 10.6.8) gitlab_omniauth-ldap (~> 1.2.1) |