diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2019-03-16 22:49:59 +0100 |
|---|---|---|
| committer | Gabriel Mazetto <brodock@gmail.com> | 2019-03-27 16:29:22 +0100 |
| commit | e5af7d83962934fc0463657a006acb54d4f85e85 (patch) | |
| tree | 72236fc27e86832ebe307af0a4d503c5be8d69f5 /Gemfile.lock | |
| parent | 98824f3e97e24a5d6cb0688167bc8411a74739fc (diff) | |
| download | gitlab-ce-e5af7d83962934fc0463657a006acb54d4f85e85.tar.gz | |
Upgrade `gitlab-markup` to 1.7.0
The new version requires `python3` to be available. In omnibus
installation this is already a reality as we are currently pathing
previous `gitlab-markup` version to use `python3` instead of `python2`.
We are now requiring `python3` with the gem without having to patch it.
As a consequence to also make it easy to use it in development, we've
introduced a `Pipfile` and `Pipfile.lock`, working similarly to
`Gemfile` and `Gemfile.lock`, and added documentation on how to use
them.
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) |