diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-01-17 18:48:51 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-01-17 18:48:51 +0000 |
| commit | ae0b888011c88f4b292b36fbc3d238a4a3458704 (patch) | |
| tree | b39b8f91071eb764fd0bde83e344b7ecab1f829c /Gemfile.lock | |
| parent | a71d8e19da723fe4fdd3c7d0ac7896c9d3130832 (diff) | |
| parent | 8bf78e3911962626aea6399afabe630e93ac85e9 (diff) | |
| download | gitlab-ce-ae0b888011c88f4b292b36fbc3d238a4a3458704.tar.gz | |
Merge branch '26375-markdown-footnotes-not-working' into 'master'
Markdown footnotes not working
Closes #26375
See merge request gitlab-org/gitlab-ce!24168
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 122e22af167..53f9e97f082 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -468,7 +468,7 @@ GEM mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.2.4) multi_json (1.13.1) @@ -483,8 +483,8 @@ GEM net-ssh (5.0.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri numerizer (0.1.1) @@ -883,9 +883,9 @@ GEM toml-rb (1.0.0) citrus (~> 3.0, > 3.0) trollop (2.1.3) - truncato (0.7.10) + truncato (0.7.11) htmlentities (~> 4.3.1) - nokogiri (~> 1.8.0, >= 1.7.0) + nokogiri (>= 1.7.0, <= 2.0) tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) @@ -1068,7 +1068,7 @@ DEPENDENCIES nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) - nokogiri (~> 1.8.5) + nokogiri (~> 1.10.1) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1165,7 +1165,7 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) - truncato (~> 0.7.9) + truncato (~> 0.7.11) u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) |