summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-20Release v2.2.3v2.2.3mo khan
2019-12-20Merge branch 'patch-1' into 'master'mo khan
Adds BSD-like See merge request gitlab-org/security-products/license-management!97
2019-12-20Update normalized-licenses.ymlJacob W
Per https://gitlab.com/gitlab-org/security-products/license-management/merge_requests/97#note_263862360
2019-12-20Merge branch 'add-job-for-12-7-stable' into 'master'mo khan
Add job for 12-7-stable See merge request gitlab-org/security-products/license-management!100
2019-12-20Add job for 12-7-stableOlivier Gonzalez
2019-12-20Merge branch '35629-update-pip' into 'master'v2.2.2Can Eldem
Install the latest pip and setuptools See merge request gitlab-org/security-products/license-management!99
2019-12-20Install the latest pip and setuptoolsmo khan
2019-12-17Update normalized-licenses.ymlJacob W
2019-12-16Merge branch 'use-bundled-with-information' into 'master'v2.2.1mo khan
Use bundled with information from Gemfile.lock See merge request gitlab-org/security-products/license-management!96
2019-12-16Use bundled with informationceldem
2019-12-16Merge branch 'prepare-no-fail' into 'master'Can Eldem
Use prepare-no-fail option See merge request gitlab-org/security-products/license-management!92
2019-12-13Use prepare-no-fail optionmo khan
2019-12-12Merge branch '37109-license-finder-5-11-1' into 'master'v2.2.0mo khan
Upgrade license finder to 5.11.1 See merge request gitlab-org/security-products/license-management!90
2019-12-11Upgrade license_finder to 5.11.1mo khan
* Run newest report version first * Change default license finder version to latest * Use --recursive for .NET projects * Update paths in c# test fixtures * Use login shell to source rvm * Tell license finder the version of python to use * Add Changelog entry
2019-12-11Merge branch 'sort-licenses' into 'master'v2.1.1mo khan
Sort license identifiers See merge request gitlab-org/security-products/license-management!91
2019-12-10Sort license identifiersmo khan
2019-12-05Merge branch 'update-license-finder' into 'master'v2.1.0Can Eldem
Update license finder to 5.9.2 See merge request gitlab-org/security-products/license-management!86
2019-12-05Update license finder to 5.9.2Can Eldem
2019-12-05Merge branch 'fix-changelog-entry' into 'master'Fabien Catteau
Update changelog entry See merge request gitlab-org/security-products/license-management!89
2019-12-04Update changelog entrymo khan
2019-12-04Merge branch 'caneldem-master-patch-36051' into 'master'Tetiana Chupryna
Update js npm expectations See merge request gitlab-org/security-products/license-management!88
2019-12-04Update js npm expectationsCan Eldem
2019-12-02Merge branch 'js-npm' into 'master'v2.0.2mo khan
Fix the js-npm integration tests See merge request gitlab-org/security-products/license-management!82
2019-11-29Install npm packages safelymo khan
* Add QA jobs for js-npm
2019-11-29Merge branch 'update-go-fixtures' into 'master'v2.0.1Tetiana Chupryna
Update go fixtures See merge request gitlab-org/security-products/license-management!87
2019-11-29Update go fixturesceldem
2019-11-28Merge branch 'default-sort' into 'master'mo khan
Delegate to license finder to sort dependencies See merge request gitlab-org/security-products/license-management!84
2019-11-28Delegate to license finder to sort dependenciesmo khan
* Sort dependencies by name then by version * Log detections
2019-11-22Merge branch 'add-job-12-6-stable' into 'master'Olivier Gonzalez
Add job for 12-6-stable See merge request gitlab-org/security-products/license-management!85
2019-11-22Add job for 12-6-stableOlivier Gonzalez
2019-11-15Merge branch '12-5' into 'master'v2.0.0Olivier Gonzalez
Change default to report version 2.0 See merge request gitlab-org/security-products/license-management!66
2019-11-15Apply reviewer feedbackmo khan
2019-11-15Apply suggestion to CHANGELOG.mdmo khan
2019-11-14Change default to report version 2.0mo khan
2019-11-05Merge branch 'add-comment-for-npm' into 'master'mo khan
Add comment for the npm install case See merge request gitlab-org/security-products/license-management!81
2019-11-05Add comment for the npm install caseCan Eldem
2019-11-04Merge branch 'update_jdk' into 'master'v1.8.3mo khan
Update Java 11 from 11.0.2 to 11.0.5 See merge request gitlab-org/security-products/license-management!80
2019-11-02Update Java 11 from 11.0.2 to 11.0.5Hannes Rosenögger
2019-11-01Merge branch 'fix-npm-node-engine' into 'master'v1.8.2Can Eldem
Ignore engine and script when converting package.lock to yarn.lock See merge request gitlab-org/security-products/license-management!79
2019-11-01Ignore engine and script when converting package.lock to yarn.lockCan Eldem
2019-10-31Merge branch 'add-name-mappings' into 'master'v1.8.1mo khan
Normalize `Apache License v2.0` See merge request gitlab-org/security-products/license-management!78
2019-10-29Add instructions on how to contribute new mappingsmo khan
2019-10-29Map `Apache License v2.0` to `Apache-2.0`mo khan
2019-10-29Merge branch '13748-cli-options' into 'master'v1.8.0mo khan
Add LICENSE_FINDER_CLI_OPTS variable See merge request gitlab-org/security-products/license-management!77
2019-10-25Add documentation for LICENSE_FINDER_CLI_OPTS in READMEmo khan
2019-10-25Monkey patch bundler to detect in sub directoriesmo khan
* Details can be found [here](https://gitlab.com/gitlab-org/gitlab/issues/13748#note_235810786)
2019-10-25Allow injection of custom options to shell commandmo khan
2019-10-24Export IMAGE_NAME in .gitlab-ci.ymlmo khan
2019-10-24Remove unnecessary parenthesesmo khan
2019-10-24Remove double quotes to allow passing multiple optionsmo khan