summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-04-17 15:56:10 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-06 13:39:36 -0600
commit9442482d091cd4fabd760797aa9455f96e5abbb6 (patch)
treecc493a8f5d77169ec1af759b3b0eb467a49e9a2d
parentb51b14507c06ed898ae4a63ffda0e84ca40342d3 (diff)
downloadgitlab-ce-9442482d091cd4fabd760797aa9455f96e5abbb6.tar.gz
Add some gems' licenses not caught by License Finder.
Also add License Finder to CI (only runs on master).
-rw-r--r--.gitlab-ci.yml5
-rw-r--r--config/.decisions.yml89
-rw-r--r--config/license_finder.yml2
3 files changed, 96 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85730e1b687..e4d81ccf350 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,6 +93,11 @@ scss-lint:
script:
- bundle exec rake scss_lint
+license-finder:
+ stage: test
+ script:
+ - bundle exec license_finder
+
brakeman:
stage: test
script:
diff --git a/config/.decisions.yml b/config/.decisions.yml
new file mode 100644
index 00000000000..7e4a8be6c48
--- /dev/null
+++ b/config/.decisions.yml
@@ -0,0 +1,89 @@
+---
+- - :whitelist
+ - MIT
+ - :who:
+ :why:
+ :versions: []
+ :when: 2016-04-17 21:12:24.558441000 Z
+- - :ignore_group
+ - development
+ - :who:
+ :why:
+ :versions: []
+ :when: 2016-04-17 21:27:01.054140000 Z
+- - :ignore_group
+ - test
+ - :who:
+ :why:
+ :versions: []
+ :when: 2016-04-17 21:27:06.250326000 Z
+- - :license
+ - raphael-rails
+ - MIT
+ - :who:
+ :why: https://github.com/mockdeep/raphael-rails/blob/master/license.txt
+ :versions: []
+ :when: 2016-04-17 21:30:07.575392000 Z
+- - :license
+ - rouge
+ - MIT
+ - :who:
+ :why: https://github.com/jneen/rouge/blob/master/LICENSE
+ :versions: []
+ :when: 2016-04-17 21:31:29.490394000 Z
+- - :license
+ - pyu-ruby-sasl
+ - MIT
+ - :who:
+ :why: https://github.com/pyu10055/ruby-sasl/blob/master/MIT-LICENSE
+ :versions: []
+ :when: 2016-04-17 21:41:55.266420000 Z
+- - :license
+ - six
+ - MIT
+ - :who:
+ :why: https://github.com/randx/six/blob/master/LICENSE
+ :versions: []
+ :when: 2016-04-17 21:42:31.420186000 Z
+- - :license
+ - rdoc
+ - GPLv2
+ - :who:
+ :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc
+ :versions: []
+ :when: 2016-04-17 21:43:30.480413000 Z
+- - :license
+ - rubypants
+ - unknown
+ - :who:
+ :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc
+ :versions: []
+ :when: 2016-04-17 21:44:49.443453000 Z
+- - :license
+ - expression_parser
+ - MIT
+ - :who:
+ :why: https://github.com/nricciar/expression_parser/blob/master/MIT-LICENSE
+ :versions: []
+ :when: 2016-04-17 21:45:41.829912000 Z
+- - :license
+ - ace-rails-ap
+ - MIT
+ - :who:
+ :why: https://github.com/codykrieger/ace-rails-ap/blob/master/LICENSE
+ :versions: []
+ :when: 2016-04-17 21:46:19.767922000 Z
+- - :license
+ - jquery-scrollto-rails
+ - MIT, GPLv2
+ - :who:
+ :why: https://github.com/JohnColvin/jquery-scrollto-rails/blob/master/MIT%20License
+ :versions: []
+ :when: 2016-04-17 21:47:56.967946000 Z
+- - :license
+ - creole
+ - ruby
+ - :who:
+ :why: https://github.com/minad/creole#license
+ :versions: []
+ :when: 2016-04-17 21:49:10.329759000 Z
diff --git a/config/license_finder.yml b/config/license_finder.yml
new file mode 100644
index 00000000000..d641563719f
--- /dev/null
+++ b/config/license_finder.yml
@@ -0,0 +1,2 @@
+---
+decisions_file: './config/.decisions.yml'