Merge pull request #160 from democrateam/release_2.1.0

Upgrade CONSUL DEMOCRACY to version 2.1.0

.codeclimate.yml

@@ -1,7 +1,7 @@
 engines:
   rubocop:
     enabled: true
-    channel: rubocop-0-74
+    channel: rubocop-1-31-0
   duplication:
     enabled: true
     config:

.dockerignore

@@ -24,6 +24,7 @@ public/tenants/*/sitemap.xml
 public/assets/
 public/machine_learning/data/
 public/tenants/*/machine_learning/data/
+node_modules/
 
 # Bundler config, cache and gemsets
 **/.bundle/

.erb-lint.yml

@@ -38,5 +38,9 @@ linters:
         Enabled: false
       Lint/UselessAssignment:
         Enabled: false
+      Rails/HttpStatus:
+        Enabled: true
+        Exclude:
+          - app/views/dashboard/*
       Rails/OutputSafety:
         Enabled: false

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 50
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 50

.github/workflows/linters.yml

@@ -1,7 +1,5 @@
 name: linters
-on:
-  pull_request:
-  workflow_dispatch:
+on: [pull_request]
 
 jobs:
   linters:
@@ -17,7 +15,7 @@ jobs:
           bundler-cache: true
       - name: Run pronto
         run: |
-          if [ ${{ github.event.pull_request.head.repo.full_name }} == ${{ github.event.pull_request.base.repo.full_name }} ]; then
+          if [[ ${{ github.event.pull_request.head.repo.full_name }} == ${{ github.event.pull_request.base.repo.full_name }} && ${{ github.actor }} != dependabot* ]]; then
             PRONTO_PULL_REQUEST_ID="$(jq --raw-output .number "$GITHUB_EVENT_PATH")" PRONTO_GITHUB_ACCESS_TOKEN="${{ github.token }}" bundle exec pronto run -f github_status github_pr -c origin/${{ github.base_ref }}
           else
             bundle exec pronto run --exit-code -c origin/${{ github.base_ref }}

.github/workflows/tests.yml

@@ -40,7 +40,12 @@ jobs:
         with:
           bundler-cache: true
       - name: Setup NPM
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
+        with:
+          cache: "npm"
+          node-version-file: ".node-version"
+      - name: Install node packages
+        run: npm clean-install
       - name: Copy secrets and database files
         run: for i in config/*.example; do cp "$i" "${i/.example}"; done
       - name: Setup database

.gitignore

@@ -26,6 +26,7 @@ tmp/
 /public/assets/
 /public/machine_learning/data/
 /public/tenants/*/machine_learning/data/
+/node_modules/
 
 # Bundler config, cache and gemsets
 .bundle/

.gitlab-ci.yml

@@ -3,7 +3,7 @@ stages:
   - lint
 
 tests:
-  image: "ruby:3.0.6"
+  image: "ruby:3.1.4"
   stage: test
   services:
     - postgres:10.10
@@ -23,6 +23,7 @@ tests:
     - bundle --without development
     - bundle exec rake db:setup
     - bundle exec rake assets:precompile > /dev/null 2>&1
+    - npm clean-install
     - bin/knapsack_pro_rspec
   artifacts:
     when: on_failure
@@ -34,7 +35,7 @@ tests:
 # PRONTO_GITLAB_API_PRIVATE_TOKEN to your repository CI/CD settings
 # giving it the value of the Personal Access Token
 linters:
-  image: "ruby:3.0.6"
+  image: "ruby:3.1.4"
   stage: lint
   cache:
     key: consul

.node-version

@@ -0,0 +1 @@
+18.18.2

.nvmrc

@@ -0,0 +1 @@
+.node-version