diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-05 10:19:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-05 10:19:55 +0000 |
| commit | 19277271be890c1f836c38f2ccd5caa40c5765e2 (patch) | |
| tree | 15158531da24da77aee6a5d29001eff3795b2252 /Gemfile.lock | |
| parent | aea3569b4f39d98de87a93b7bf0c64e42cbcfeb0 (diff) | |
| parent | 9318f4ab2b6396782edb277aeddf45720d70b7e6 (diff) | |
| download | gitlab-ce-19277271be890c1f836c38f2ccd5caa40c5765e2.tar.gz | |
Merge branch 'zj-fix-flay' into 'master'
Fix flay not detecting identical code
Closes #42628
See merge request gitlab-org/gitlab-ce!16828
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2ddf8221a06..cf9f160499d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,7 +211,7 @@ GEM fast_gettext (1.4.0) ffaker (2.4.0) ffi (1.9.18) - flay (2.8.1) + flay (2.10.0) erubis (~> 2.7.0) path_expander (~> 1.0) ruby_parser (~> 3.0) @@ -588,7 +588,7 @@ GEM ast (~> 2.3) parslet (1.5.0) blankslate (~> 2.0) - path_expander (1.0.1) + path_expander (1.0.2) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -1037,7 +1037,7 @@ DEPENDENCIES faraday (~> 0.12) fast_blank ffaker (~> 2.4) - flay (~> 2.8.0) + flay (~> 2.10.0) flipper (~> 0.11.0) flipper-active_record (~> 0.11.0) flipper-active_support_cache_store (~> 0.11.0) |