diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-03-28 12:04:54 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-03-28 12:04:54 +0300 |
| commit | ef18642b1fca7c661a8dff5ff2f86f3ff0da1f49 (patch) | |
| tree | 7333877601083b2fc6afbea59fd6b62219486311 /Gemfile.lock | |
| parent | 8d07bc9c9f6846a2675c299953312a6ccfed4362 (diff) | |
| parent | e5af7d83962934fc0463657a006acb54d4f85e85 (diff) | |
Merge branch '59062-update-gitlab-markup-python-3' into 'master'
Update gitlab-markup to 1.7.0 and document Python3 requirements
Closes #59062
See merge request gitlab-org/gitlab-ce!26246
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4c88afc7e24..a8f1f4c8e76 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -286,7 +286,7 @@ GEM github-markup (1.7.0) gitlab-default_value_for (3.1.1) activerecord (>= 3.2.0, < 6.0) - gitlab-markup (1.6.5) + gitlab-markup (1.7.0) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) gitlab-styles (2.5.1) @@ -1020,7 +1020,7 @@ DEPENDENCIES gitaly-proto (~> 1.13.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) - gitlab-markup (~> 1.6.5) + gitlab-markup (~> 1.7.0) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.1.1) |