Commit 64ef3bfd authored by Marin Jankovski's avatar Marin Jankovski

Merge branch '10-4-licenses-update' into 'master'

10.4 licenses update

Closes #10

See merge request gitlab-org/gitlab-ce!16269
parents 4ddc5dba 29084626
......@@ -23,7 +23,7 @@ autoprefixer-rails,6.2.3,MIT
axiom-types,0.1.1,MIT
babosa,1.0.2,MIT
base32,0.3.2,MIT
batch-loader,1.1.1,MIT
batch-loader,1.2.1,MIT
bcrypt,3.1.11,MIT
bcrypt_pbkdf,1.0.0,MIT
bindata,2.4.1,ruby
......@@ -73,8 +73,9 @@ faraday_middleware,0.11.0.1,MIT
faraday_middleware-multi_json,0.0.6,MIT
fast_gettext,1.4.0,"MIT,ruby"
ffi,1.9.18,New BSD
flipper,0.10.2,MIT
flipper-active_record,0.10.2,MIT
flipper,0.11.0,MIT
flipper-active_record,0.11.0,MIT
flipper-active_support_cache_store,0.11.0,MIT
flowdock,0.7.1,MIT
fog-aliyun,0.2.0,MIT
fog-aws,1.4.0,MIT
......@@ -92,7 +93,7 @@ gemojione,3.3.0,MIT
get_process_mem,0.2.0,MIT
gettext_i18n_rails,1.8.0,MIT
gettext_i18n_rails_js,1.2.0,MIT
gitaly-proto,0.59.0,MIT
gitaly-proto,0.64.0,MIT
github-linguist,4.7.6,MIT
github-markup,1.6.1,MIT
gitlab-flowdock-git-hook,1.0.1,MIT
......@@ -164,7 +165,7 @@ multi_xml,0.6.0,MIT
multipart-post,2.0.0,MIT
mustermann,1.0.0,MIT
mustermann-grape,1.0.0,MIT
mysql2,0.4.5,MIT
mysql2,0.4.10,MIT
net-ldap,0.16.0,MIT
net-ssh,4.1.0,MIT
netrc,0.11.0,MIT
......@@ -210,7 +211,7 @@ po_to_json,1.0.1,MIT
posix-spawn,0.3.13,MIT
premailer,1.10.4,New BSD
premailer-rails,1.9.7,MIT
prometheus-client-mmap,0.7.0.beta43,Apache 2.0
prometheus-client-mmap,0.7.0.beta44,Apache 2.0
public_suffix,3.0.0,MIT
pyu-ruby-sasl,0.0.3.3,MIT
rack,1.6.8,MIT
......@@ -237,11 +238,11 @@ re2,1.1.1,New BSD
recaptcha,3.0.0,MIT
recursive-open-struct,1.0.0,MIT
redcarpet,3.4.0,MIT
redis,3.3.3,MIT
redis,3.3.5,MIT
redis-actionpack,5.0.2,MIT
redis-activesupport,5.0.4,MIT
redis-namespace,1.5.2,MIT
redis-rack,2.0.3,MIT
redis-rack,2.0.4,MIT
redis-rails,5.0.2,MIT
redis-store,1.4.1,MIT
representable,3.0.4,MIT
......@@ -273,7 +274,7 @@ select2-rails,3.5.9.3,MIT
sentry-raven,2.5.3,Apache 2.0
settingslogic,2.0.9,MIT
sexp_processor,4.9.0,MIT
sidekiq,5.0.4,LGPL
sidekiq,5.0.5,LGPL
sidekiq-cron,0.6.0,MIT
sidekiq-limit_fetch,3.4.0,MIT
signet,0.7.3,Apache 2.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment