Skip to content

Commit 64896ea

Browse files
authored
Merge branch 'gh-pages' into gh-pages
2 parents e6ff5fa + 5e88a1c commit 64896ea

4 files changed

Lines changed: 9 additions & 17 deletions

File tree

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1
1+
2.5.3

.travis.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,9 @@ env:
77
global:
88
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
99

10-
addons:
11-
apt:
12-
packages:
13-
- libcurl4-openssl-dev # required to avoid SSL errors
14-
1510
branches:
1611
only:
1712
- gh-pages
1813
- /.*/
1914

20-
before_install:
21-
- openssl version
22-
- openssl ciphers -v
23-
- openssl s_client -cipher ECDHE-RSA-AES256-GCM-SHA384 -connect github.blog:443 -tls1_2
24-
- curl -sSL -D - https://github.blog/2014-02-14-rendered-prose-diffs/ -o /dev/null
25-
sudo: false
2615
cache: bundler

Gemfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
source 'https://rubygems.org'
44

5-
gem 'github-pages'
6-
gem 'jekyll-octicons'
7-
# need lazy-load support
8-
gem 'jekyll-avatar', '>= 0.6.0'
5+
gem 'github-pages', '> 103', group: :jekyll_plugins
6+
7+
group :jekyll_plugins do
8+
gem 'jekyll-octicons'
9+
# need lazy-load support
10+
gem 'jekyll-avatar'
11+
end
912

1013
group :development, :test do
1114
gem 'html-proofer'

_data/governments.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ Norway:
368368
- nasjonalmuseet
369369
- navikt
370370
- nlbdev
371+
- Riksrevisjonen
371372
- Rogaland
372373
- rutebanken
373374
- ruterno
@@ -718,7 +719,6 @@ U.S. Federal:
718719
- globegit
719720
- gopleader
720721
- government-services
721-
- GreatSmokyMountainsNationalPark
722722
- gsa
723723
- gsa-oes
724724
- hhs

0 commit comments

Comments
 (0)