Merge pull request #85 from nimblehq/release/2.4.0

.eslintignore

@@ -6,7 +6,6 @@
 /vendor/**
 
 postcss.config.js
-babel.config.js
 
 app/javascript/channels/*
 app/javascript/translations/translations.js

.github/ISSUE_TEMPLATE/bug_template.md

@@ -7,7 +7,7 @@ labels: "type : bug"
 
 ## Issue
 
-Describe the issue you are facing. Show us the implementation: screenshots, GIF, etc.
+Describe the issue you are facing. Show us the implementation: screenshots, GIFs, etc.
 
 ## Expected
 

.github/ISSUE_TEMPLATE/chore_template.md

@@ -7,7 +7,7 @@ labels: "type : chore"
 
 ## Why
 
-Describe the details of the update and why it's needed.
+Describe the update in detail and why it is needed.
 
 ## Who Benefits?
 

.github/ISSUE_TEMPLATE/feature_template.md

@@ -7,7 +7,7 @@ labels: "type : feature"
 
 ## Why
 
-Describe the big picture of the feature and why it's needed.
+Describe the big picture of the feature and why it is needed.
 
 ## Who Benefits?
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-Resolves https://github.com/nimblehq/nimble-survey-web/issues/??
+- Close #
 
 ## What happened 👀
 

.github/PULL_REQUEST_TEMPLATE/release_template.md

@@ -1,4 +1,4 @@
-https://github.com/nimblehq/react-templates/milestone/{ID}?closed=1
+https://github.com/nimblehq/nimble-survey-web/milestone/{ID}?closed=1
 
 ## Features
 
@@ -8,8 +8,8 @@ Provide the Pull Request IDs in the section for each type (feature, chore, and b
 
 ## Chores
 
--   Same structure as in ## Feature
+-   Same structure as in ## Features
 
 ## Bugs
 
--   Same structure as in ## Feature
+-   Same structure as in ## Features

.github/workflows/danger.yml

@@ -1,41 +1,39 @@
 name: Automated code review
 
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
+on: pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   run:
     name: Run Danger
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
 
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 100
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.7.1"
+          ruby-version: "3.0.6"
           bundler-cache: true
 
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: "12"
+          node-version: "18.15.0"
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
       - name: Cache yarn packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -45,7 +43,7 @@ jobs:
 
       - name: Cache node_modules
         id: node-modules-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: node_modules
           key: ${{ runner.os }}-nodemodules-${{ hashFiles('**/yarn.lock') }}

.github/workflows/deploy.yml

@@ -5,12 +5,16 @@ on:
     workflows:
       - Test
     branches:
-      - master
-      - development
+      - main
+      - develop
     types:
       - completed
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 env:
   DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
   DOCKER_USERNAME: ${{ github.repository_owner }}
@@ -24,18 +28,13 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.workflow_run.head_branch || github.ref }}
 
       - name: Set BRANCH_TAG
-        uses: nimblehq/branch-tag-action@v1.2
+        uses: nimblehq/branch-tag-action@v1
         with:
           ref: ${{ github.event.workflow_run.head_branch || github.ref }}
 

.github/workflows/docker_build_test.yml

@@ -3,8 +3,12 @@ name: Docker build test
 on:
   push:
     branches-ignore:
-      - master
-      - development
+      - main
+      - develop
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   docker_production_test:
@@ -14,16 +18,11 @@ jobs:
       DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
       DOCKER_IMAGE: ${{ github.repository }}
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
 
       - name: Set BRANCH_TAG
-        uses: nimblehq/branch-tag-action@v1.2
+        uses: nimblehq/branch-tag-action@v1
 
       - name: Try building Docker image
         run: |

.github/workflows/test.yml

@@ -1,6 +1,10 @@
 name: Test
 
-on: push
+on: pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
@@ -14,22 +18,17 @@ jobs:
     name: Build docker image
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
 
       - name: Set BRANCH_TAG
-        uses: nimblehq/branch-tag-action@v1.2
+        uses: nimblehq/branch-tag-action@v1
 
       - name: Log in to Docker registry
         run: echo "$DOCKER_TOKEN" | docker login $DOCKER_REGISTRY --username=$DOCKER_USERNAME --password-stdin
 
       - name: Pull Docker image
-        if: env.BRANCH_TAG != 'latest' && env.BRANCH_TAG != 'development'
+        if: env.BRANCH_TAG != 'latest' && env.BRANCH_TAG != 'develop'
         run: docker-compose pull test || true
 
       - name: Build Docker image
@@ -44,10 +43,10 @@ jobs:
     needs: build
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
 
       - name: Set BRANCH_TAG
-        uses: nimblehq/branch-tag-action@v1.2
+        uses: nimblehq/branch-tag-action@v1
 
       - name: Log in to Docker registry
         run: echo "$DOCKER_TOKEN" | docker login $DOCKER_REGISTRY --username=$DOCKER_USERNAME --password-stdin
@@ -67,10 +66,10 @@ jobs:
     needs: build
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
 
       - name: Set BRANCH_TAG
-        uses: nimblehq/branch-tag-action@v1.2
+        uses: nimblehq/branch-tag-action@v1
 
       - name: Log in to Docker registry
         run: echo "$DOCKER_TOKEN" | docker login $DOCKER_REGISTRY --username=$DOCKER_USERNAME --password-stdin

.gitignore

@@ -46,3 +46,6 @@
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+
+/app/assets/builds/*
+!/app/assets/builds/.keep