Merge branch 'gh-pages' into patch-2

Author: jbjonesjr

_config.yml

@@ -7,7 +7,7 @@ relative_permalinks: false
 analytics_account: "UA-3769691-28"
 
 # build settings
-exclude: ["script", "vendor", "bower.json", "Gemfile", "Gemfile.lock", "Rakefile", "readme.md", "package.json", "node_modules", "fedramp.md", "fedramp-confirmation.md"]
+exclude: ["script", "vendor", "bower.json", "Gemfile", "Gemfile.lock", "Rakefile", "readme.md", "package.json", "node_modules"]
 markdown: kramdown
 plugins:
   - jekyll-avatar

_data/governments.yml

@@ -139,6 +139,7 @@ Canada:
   - ServiceCanada
   - StatCan
   - TBS-EACPD
+  - tc-ca
   - thecityofcalgary
   - VilledeMontreal
   - wet-boew
@@ -425,6 +426,7 @@ Switzerland:
   - dsi-vd
   - FNSKtZH
   - gisktzh
+  - kanton-bern
   - ogdch
   - sitn
   - swiss-gov
@@ -450,6 +452,7 @@ The Netherlands:
 U.K. Central:
   - alphagov
   - BEACmodel
+  - britishlibrary
   - cabinetoffice
   - CJSCommonPlatform
   - communitiesuk
@@ -464,6 +467,7 @@ U.K. Central:
   - dstl
   - dvla
   - dvsa
+  - dwp
   - GCHQ
   - gds-dead
   - gds-operations
@@ -501,6 +505,7 @@ U.K. Central:
   - UKHomeOffice
   - UKLocation
   - ukncsc
+  - ukwa
 
 U.K. Councils:
   - BarnsleyCouncil

_data/research.yml

@@ -30,7 +30,6 @@ U.S. Research Labs:
   - esgf
   - exmatex
   - flux-framework
-  - GENIEMC
   - globus
   - glvis
   - HipGISAXS

index.html

@@ -5,6 +5,19 @@
 org_count: 60
 permalink: /
 ---
+<div class="container-lg p-responsive">	
+  <div class="Box clearfix p-4 p-sm-5 col-md-7 mx-auto mt-6">
+    <div class="float-left">
+      <img class="d-block pr-4" style="width: 80px;" alt="FedRAMP Logo" src="{{"/assets/img/Fedramp-logo.svg" | relative_url}}">
+    </div>
+    <div class="overflow-hidden">
+      <p>GitHub is now Federal Risk and Authorization Management Program (FedRAMP) authorized.
+      </p>
+      <a href="{{"/fedramp/" | relative_url}}">Learn More {% octicon chevron-right height:18 class:"d-inline fill-blue ml-1" %}</a>
+    </div>
+  </div>
+</div>
+
 <section class="container-lg p-responsive py-5 py-md-6 my-lg-6">
   <div class="clearfix gutter-spacious">
     <div class="mb-3 mb-md-5 col-md-6 float-left">

script/ensure-orgs

@@ -41,6 +41,7 @@ files.each do |file|
   data.each do |group, orgs|
     not_orgs = Parallel.map(orgs) { |org| org unless org?(org) }.compact
     next if not_orgs.empty?
+
     puts "\nIn #{File.basename(file)}, in the #{group} group, the following entries are users, not orgs:\n\n"
     puts not_orgs
     valid = false

script/fetch-us

@@ -27,6 +27,7 @@ orgs = orgs['results'].collect { |data| data['account'] }
 orgs.each do |org|
   next if existing.include?(org.downcase)
   next unless org_exists? org
+
   org_file['U.S. Federal'].push(org.downcase)
 end