From 5b804796b78ba2dff1dc90354e5e947f9b20ff30 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 24 Sep 2018 15:36:02 -0700 Subject: [PATCH 1/3] bundler/bundler#6629 workaround no longer needed --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index b37867e..b659455 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -3,7 +3,7 @@ set -e echo "bundling installin'" -gem install bundler --version 1.16.2 +gem install bundler bundle install echo From cce91b79ec138a7f42369d432241d3896211f5e1 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 24 Sep 2018 15:38:35 -0700 Subject: [PATCH 2/3] upate pgbager LICENSE url --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 31f9e12..eb151b5 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -7,7 +7,7 @@ description: A very short, BSD-style license, used specifically for PostgreSQL. how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution. using: - - pgBadger: https://github.com/dalibo/pgbadger/blob/master/LICENSE + - pgBadger: https://github.com/darold/pgbadger/blob/master/LICENSE - pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE From 3909e2190a1a7b2fd5ab791548b14d44a200a10e Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 24 Sep 2018 15:39:55 -0700 Subject: [PATCH 3/3] bow to new rubocop rule --- spec/spec_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 49286b2..192d00e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -106,6 +106,7 @@ def fsf_approved_licenses licenses = {} object['licenses'].each_value do |meta| next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre') + meta['identifiers']['spdx'].each do |identifier| licenses[identifier.downcase] = meta['name'] end