Merge pull request #324 from snap-cloud/merge-upstream

Merge upstream
snap-cloud · Feb 13, 2024 · b6de0de · b6de0de
2 parents 047cd8c + 27ad42d
commit b6de0de
Show file tree

Hide file tree

Showing 93 changed files with 1,242 additions and 829 deletions.
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: '12.x'
+          node-version: '16.x'
       - run: sudo apt-get install xvfb
       - name: Install JavaScript libraries via npm
         run: npm install

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,8 +1,10 @@
-inherit_from: .rubocop_todo.yml
-
 require:
   - rubocop-rspec
-  - rubocop-rails # Currently disabled below.
+  - rubocop-rails
+  - rubocop-capybara
+  - rubocop-performance
+
+inherit_from: .rubocop_todo.yml
 
 inherit_mode:
   merge: