diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-17 22:12:59 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-09-17 22:12:59 +0300 |
| commit | be7328dea292bb9d7b3847db990f0a62b79e3f25 (patch) | |
| tree | 25c69421a4277f33c3139490b06b3bd2710d48cf | |
| parent | 1d925e5cbf7ed7902dc5cbcb18b7d61a6cac57e6 (diff) | |
| parent | 89679f4cdf2c81a0cba30593aec710abb46f41c4 (diff) | |
Merge branch 'rails5-commonmaker' into 'master'
Sync commonmaker version in Gemfile.*.lock
Closes #51557
See merge request gitlab-org/gitlab-ce!21782
| -rw-r--r-- | Gemfile.rails5.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 48b1190fd56..aa6a32fa84e 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -128,7 +128,7 @@ GEM coderay (1.1.2) coercible (1.0.0) descendants_tracker (~> 0.0.1) - commonmarker (0.17.8) + commonmarker (0.17.13) ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) |