diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-11 15:29:19 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-11 15:29:19 +0000 |
commit | 7bca4cabc220c03a2bfb19a873421a764a3011d6 (patch) | |
tree | b9ce4cc975b825b633968119d8843295aa2c1db6 /Gemfile.lock | |
parent | dfd8ae8a8457e08f3e2da7732c59dbf70e541460 (diff) | |
parent | 6748dd2fd0b2cf694661e910c6c1bb6ac2be69a1 (diff) | |
download | gitlab-ce-7bca4cabc220c03a2bfb19a873421a764a3011d6.tar.gz |
Merge branch 'flog' into 'master'
Add method complexity check to CI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1783
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 49dc9ff119c..6b352fa8b38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -194,6 +194,9 @@ GEM ffi (1.9.10) fission (0.5.0) CFPropertyList (~> 2.2) + flog (4.3.2) + ruby_parser (~> 3.1, > 3.1.0) + sexp_processor (~> 4.4) flowdock (0.7.0) httparty (~> 0.7) multi_json @@ -821,6 +824,7 @@ DEPENDENCIES enumerize (~> 0.7.0) factory_girl_rails (~> 4.3.0) ffaker (~> 2.0.0) + flog fog (~> 1.25.0) font-awesome-rails (~> 4.2) foreman |