Merge branch 'gh-pages' into add-cice-consortium

Author: mlinksva

.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.3

.travis.yml

@@ -7,20 +7,9 @@ env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
 
-addons:
-  apt:
-    packages:
-    - libcurl4-openssl-dev # required to avoid SSL errors
-
 branches:
   only:
     - gh-pages
     - /.*/
 
-before_install:
-- openssl version
-- openssl ciphers -v
-- openssl s_client -cipher ECDHE-RSA-AES256-GCM-SHA384 -connect github.blog:443 -tls1_2
-- curl -sSL -D - https://github.blog/2014-02-14-rendered-prose-diffs/ -o /dev/null
-sudo: false
 cache: bundler

Gemfile

@@ -2,10 +2,13 @@
 
 source 'https://rubygems.org'
 
-gem 'github-pages'
-gem 'jekyll-octicons'
-# need lazy-load support
-gem 'jekyll-avatar', '>= 0.6.0'
+gem 'github-pages', '> 103', group: :jekyll_plugins
+
+group :jekyll_plugins do
+  gem 'jekyll-octicons'
+  # need lazy-load support
+  gem 'jekyll-avatar'
+end
 
 group :development, :test do
   gem 'html-proofer'

_data/civic_hackers.yml

@@ -148,6 +148,7 @@ Code for All:
   - codeforaustralia
   - codeforbrazil
   - codeforeurope
+  - codeforfr
   - codeforgermany
   - codeforireland
   - codeforjapan

_data/governments.yml

@@ -82,6 +82,7 @@ Brazil:
   - labhackercd
   - lexml
   - MP-ES
+  - MP-RJ
   - pensandoodireito
   - plonegovbr
   - pr-snas
@@ -103,19 +104,22 @@ Canada:
   - AAFC-MBB
   - abgov
   - bcdevexchange
+  - bac-lac
   - BCGov
   - canada-ca
   - cds-snc
   - CIHR
   - cityofgreatersudbury
   - cityofottawa
   - cityofsurrey
+  - CityOfSarnia
   - CityofToronto
   - CityofEdmonton
   - cityssm
   - cngo
   - communicationssecurityestablishment
   - csbp-cpse
+  - CSPS-EFPC-DAAN
   - ECCC-MSC
   - electionsquebec
   - esdc-devx
@@ -150,22 +154,6 @@ Canada:
   - VilledeMontreal
   - wet-boew
 
-Catalonia:
-  - AjuntamentdeBarcelona
-  - AjuntamentdeSabadell
-  - AjuntamentdeSantCugat
-  - AjuntamentdeTerrassa
-  - AjuntamentDeMataro
-  - AjuntamentdeReus
-  - AjuntamentDeGava
-  - AjuntamentdeCalafell
-  - AjMalgrat
-  - diputacioBCN
-  - gencat
-  - HospitaletDeLlobregat
-  - projectestac
-  - vilanovailageltru
-
 Chile:
   - e-gob
 
@@ -206,6 +194,7 @@ European Union:
 Finland:
   - 6Aika
   - City-of-Helsinki
+  - City-of-Turku
   - CSC-IT-Center-for-Science
   - Digipalvelutehdas
   - finnishtransportagency
@@ -222,6 +211,7 @@ Finland:
 France:
   - afimb
   - AlsaceDigitale
+  - AmbaNum
   - ANSSI-FR
   - ApieFrance
   - betagouv
@@ -231,6 +221,7 @@ France:
   - cea-sec
   - clipos
   - clipos-archive
+  - cw-leia
   - communaute-cimi
   - culturecommunication
   - DGFiP
@@ -241,13 +232,15 @@ France:
   - erasme
   - etalab
   - Inist-CNRS
+  - InseeFr
   - SocieteNumerique
   - lutece-secteur-public
   - MINAGRI-INITIAL
   - MTES-MCT
   - MinistereSupRecherche
   - nanterre
   - nantesmetropole
+  - opencti-platform
   - PnCevennes
   - PnEcrins
   - PnX-SI
@@ -367,6 +360,7 @@ Norway:
   - nasjonalmuseet
   - navikt
   - nlbdev
+  - Riksrevisjonen
   - Rogaland
   - rutebanken
   - ruterno
@@ -420,13 +414,27 @@ South Africa:
   - eddZA
 
 Spain:
+  - AjMalgrat
+  - AjuntamentdeBarcelona
+  - AjuntamentdeCalafell
   - AjuntamentdeCastello
+  - AjuntamentDeGava
+  - AjuntamentDeMataro
+  - AjuntamentdeReus
+  - AjuntamentdeSabadell
+  - AjuntamentdeSantCugat
+  - AjuntamentdeTerrassa
   - AyuntamientoMadrid
   - castilla-lamancha
   - ctt-gob-es
+  - diputacioBCN
   - ErabakiPamplona
+  - gencat
   - GobiernoLaRioja
+  - HospitaletDeLlobregat
   - icane
+  - projectestac
+  - vilanovailageltru
 
 Sweden:
   - arbetsformedlingen
@@ -438,6 +446,7 @@ Sweden:
   - Helsingborg
   - helsingborg-stad
   - ISOF-ITD
+  - jobtechswe
   - kungbib
   - Lantmateriet
   - libris
@@ -463,8 +472,10 @@ Sweden:
   - Sundsvallskommun
   - sverigesradio
   - SVT
+  - swedish-council-for-higher-education
   - swedishpensionsagency
   - The-Municipality-of-Staffanstorp
+  - umea-kommun
   - Vastra-Gotalandsregionen
   - vasttrafik
 
@@ -638,6 +649,7 @@ U.S. City:
   - longbeachinnovationteam
   - LouisvilleMetro
   - mnhrc
+  - moda-nyc  
   - monum
   - NYCComptroller
   - nycdot
@@ -692,14 +704,14 @@ U.S. Federal:
   - ccmc
   - CDCgov
   - cfpb
+  - cisagov
   - cmsgov
   - commercedataservice
   - commercegov
   - defense-cyber-crime-center
   - demand-driven-open-data
   - department-of-veterans-affairs
   - deptofdefense
-  - dhs-ncats
   - didsr
   - digital-analytics-program
   - doecode
@@ -717,7 +729,6 @@ U.S. Federal:
   - globegit
   - gopleader
   - government-services
-  - GreatSmokyMountainsNationalPark
   - gsa
   - gsa-oes
   - hhs

_data/research.yml

@@ -60,6 +60,7 @@ U.S. Research Labs:
   - mfem
   - MG-RAST
   - mit-ll
+  - mitre
   - NASA-Tensegrity-Robotics-Toolkit
   - nasajpl
   - ncats

index.html

@@ -83,7 +83,7 @@ <h2 class="alt-h3 mb-2">
         {% octicon globe height:28 class:"fill-blue d-inline mr-2" aria-label:globe %}
         Public engagement, developer community
       </h2>
-      <p class="text-gray">Engage with 17 million developers using GitHub. Publish open source software on GitHub.com. Onboard, train, and recruit developers with ease.</p>
+      <p class="text-gray">Engage with more than 40 million developers using GitHub. Publish open source software on GitHub.com. Onboard, train, and recruit developers with ease.</p>
     </div>
     <div class="mb-3 mb-md-5 col-md-6 float-left">
       <h2 class="alt-h3 mb-2">