diff options
| author | Marin Jankovski <marin@gitlab.com> | 2016-10-13 13:54:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-17 14:05:06 +0200 |
| commit | de52b57718d9b31371979b16832b1cc9718f609f (patch) | |
| tree | cdf8e1f1a4dcff41b1e9e56f1e64cb90c7d1d279 | |
| parent | 7c99ad88d41cd3a560c95ac26c037db6b83847e6 (diff) | |
| download | gitlab-ce-de52b57718d9b31371979b16832b1cc9718f609f.tar.gz | |
Merge branch 'bug/rst-forked-gem' into 'master'
Use forked github-markup gem to enable python3 support with omnibus
Changes the version of `github-markup` gem we are using, to be the forked one with the changes to enable python3 support.
The change is backward compatible with users using Python 2, and will only be running with Python 3 in Omnibus (with the help of a custom patch we apply there).
Make sure backward compatibility isn't broken for source installs.
You need to make sure you pickup into stable this merge request as well (for omnibus): https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1015 as it's part of the fix, otherwise package will fail to build.
We had some regressions with .rst rendering that were fixed, but still some issues with encoding persisted (this MR will fix that). See: https://gitlab.com/gitlab-org/gitlab-ce/issues/21696
* gitlab-org/gitlab-ce#21696
* gitlab-org/gitlab-ce#22748
* gitlab-com/support-forum#1097
See merge request !6659
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index a5afc6fb1a9..3a3c3abe361 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.12.7 - Prevent running GfmAutocomplete setup for each diff note. !6569 - Fix Long commit messages overflow viewport in file tree. !6573 + - Use gitlab-markup gem instead of github-markup to fix `.rst` file rendering. !6659 v 8.12.6 - Update mailroom to 0.8.1 in Gemfile.lock !6814 @@ -103,7 +103,7 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' -gem 'github-markup', '~> 1.4' +gem 'gitlab-markup', '~> 1.5.0' gem 'redcarpet', '~> 3.3.3' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~>3.6' diff --git a/Gemfile.lock b/Gemfile.lock index 6e99e9415dc..7b31b20c6ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,6 +279,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) + gitlab-markup (1.5.0) gitlab_git (10.6.6) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -865,8 +866,8 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.0) github-linguist (~> 4.7.0) - github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) + gitlab-markup (~> 1.5.0) gitlab_git (~> 10.6.6) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) |