From fa9c98294400a4716d72c4252161804d5f889d8e Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Mon, 16 Jul 2018 22:01:53 +0200
Subject: [PATCH 1/3] Lint with rubocop-jekyll

---
 .rubocop.yml | 8 +++-----
 Gemfile      | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index a078dd3..a4f8ed7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,11 +1,9 @@
+require: rubocop-jekyll
+
 inherit_gem:
-  jekyll: .rubocop.yml
+  rubocop-jekyll: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
-  Include:
-    - report
-    - github/jwt
   Exclude:
     - sites/**/*
     - vendor/**/*
diff --git a/Gemfile b/Gemfile
index fdee7c0..3dcff36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,5 +59,5 @@ gem "uswds-jekyll" # 18F/federalist-docs
 gem "jekyll_pages_api_search", group: :jekyll_plugins # 18F/federalist-docs
 
 group :dev do
-  gem "rubocop", "~> 0.57.0"
+  gem "rubocop-jekyll", "~> 0.1.0"
 end

From ced6345a8f4416c5f73e5d8b92cb4c605e166fea Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Tue, 24 Jul 2018 19:39:48 +0200
Subject: [PATCH 2/3] Target latest stable Ruby

Co-Authored-By: Pat Hawks <pat@pathawks.com>
---
 .rubocop.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index a4f8ed7..8c3dda7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,6 +4,7 @@ inherit_gem:
   rubocop-jekyll: .rubocop.yml
 
 AllCops:
+  TargetRubyVersion: 2.5
   Exclude:
     - sites/**/*
     - vendor/**/*

From 1a5b2a1a7fdd07abc8f3020f8a7e2f90f8d6b309 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Tue, 18 Dec 2018 11:29:24 +0100
Subject: [PATCH 3/3] chore(deps): add rubocop-jekyll

---
 .rubocop.yml | 1 +
 .travis.yml  | 4 ++--
 Gemfile      | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8c3dda7..d01139e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,6 +8,7 @@ AllCops:
   Exclude:
     - sites/**/*
     - vendor/**/*
+    - Gemfile
 
 Jekyll/NoPutsAllowed:
   Enabled: false
diff --git a/.travis.yml b/.travis.yml
index e317f41..a52c733 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 sudo: false
 language: ruby
-rvm: 2.4
+rvm: 2.5
 cache: bundler
 
 branches:
@@ -17,6 +17,6 @@ before_script:
 matrix:
   include:
   - name: Rubocop
-    script: bundle exec rubocop -D
+    script: bundle exec rubocop -S -D -E
   - name: bench
     script: ./bench
diff --git a/Gemfile b/Gemfile
index 7d5a0d8..6c888de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 repo = ENV.fetch("REPO", "https://github.com/jekyll/jekyll.git")
@@ -5,7 +7,7 @@ repo = ENV.fetch("REPO", "https://github.com/jekyll/jekyll.git")
 if ENV["REF"]
   gem "jekyll", git: repo, ref: ENV["REF"]
 elsif ENV["PR"]
-  gem "jekyll", git: repo, ref: "refs/pull/#{ENV['PR']}/head"
+  gem "jekyll", git: repo, ref: "refs/pull/#{ENV["PR"]}/head"
 else
   gem "jekyll", git: repo, branch: "master"
 end
@@ -63,5 +65,5 @@ gem "redcarpet"
 gem "uswds-jekyll"
 
 group :dev do
-  gem "rubocop", "~> 0.61.0"
+  gem "rubocop-jekyll", "~> 0.4"
 end