diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-18 15:44:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-18 15:44:36 +0000 |
| commit | 039b0c0dbd956e458000fb4f3f7cf0a638098912 (patch) | |
| tree | f5eb6da09c323ca451f7d10fc91d99d45fc82d61 /Gemfile.rails5.lock | |
| parent | b4c1080494069f81be4c733fdad52a51d1f0d682 (diff) | |
| parent | 3c725a2a5d340a2edae8a79ad6af3a0924cc8f14 (diff) | |
| download | gitlab-ce-039b0c0dbd956e458000fb4f3f7cf0a638098912.tar.gz | |
Merge branch 'master' into 'security-fj-bumping-sanitize-gem'
# Conflicts:
# Gemfile.rails5.lock
Diffstat (limited to 'Gemfile.rails5.lock')
| -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 51a4d954e9c..f9d9391ef80 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -307,7 +307,7 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4) + gitlab-gollum-rugged_adapter (0.4.4.1) mime-types (>= 1.15) rugged (~> 0.25) gitlab-grit (2.8.2) |