Merge branch 'master' into add-cache-action

kenyonj · web-flow · commit f99961d08273 · 2020-03-24T23:36:18.000-04:00
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -6,11 +6,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: 2.7
     - name: Install bundler
       run: |
         gem install bundler:1.14.0
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,7 +1,7 @@
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
   Exclude:
     - '**/bin/**/*'
     - '**/db/**/*'
@@ -32,4 +32,3 @@ Style/TrailingCommaInArrayLiteral:
 
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
-
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.5.1
+2.7.0
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -37,4 +37,4 @@ DEPENDENCIES
   safe_yaml
 
 BUNDLED WITH
-   1.16.1
+   2.1.4
