Merge pull request #608 from github/rvbundler6629

Remove bundler workaround, update link and code style

_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
 

script/bootstrap

@@ -3,7 +3,7 @@
 set -e
 
 echo "bundling installin'"
-gem install bundler --version 1.16.2
+gem install bundler
 bundle install
 
 echo

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