diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-07 08:06:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-07 08:06:17 +0000 |
| commit | 9e256de4ac33e284ceb88c6af410f87c5f51228d (patch) | |
| tree | 1bc3f81527b0376159a7faba64d9f586c26b2be2 /Gemfile.lock | |
| parent | d9f1fb164066171623fa236030b5559c56a06d0e (diff) | |
| parent | 7900c035bf3f0cf96740227aebadbb3cad276ba0 (diff) | |
| download | gitlab-ce-9e256de4ac33e284ceb88c6af410f87c5f51228d.tar.gz | |
Merge branch 'license-finder-gem' into 'master'
License finder gem
Every time a gem is added to the Gemfile, or a gem is updated with a new dependency or change of license, LicenseFinder will check to ensure that the license in use has been whitelisted for use in the project. GPLv2 and GPLv3 libraries are not allowed to be linked-to from non-GPL projects (e.g. the MIT-licensed GitLab CE or proprietary EE), otherwise we're violating the license.
https://github.com/pivotal/LicenseFinder
See also: gitlab-com/operations#164
See merge request !3775
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 21d8f345cd7..0eab33ec5ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -366,6 +366,12 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) + license_finder (2.1.0) + bundler + httparty + rubyzip + thor + xml-simple licensee (8.0.0) rugged (>= 0.24b) listen (3.0.5) @@ -618,6 +624,7 @@ GEM sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) + rubyzip (1.2.0) rufus-scheduler (3.1.10) rugged (0.24.0) safe_yaml (1.0.4) @@ -789,6 +796,7 @@ GEM builder expression_parser rinku + xml-simple (1.1.5) xpath (2.0.0) nokogiri (~> 1.3) @@ -875,6 +883,7 @@ DEPENDENCIES jwt kaminari (~> 0.17.0) letter_opener_web (~> 1.3.0) + license_finder licensee (~> 8.0.0) loofah (~> 2.0.3) mail_room (~> 0.7) |