diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25e7a7a57..99c8f409a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,7 @@ jobs: IS_MERGE: ${{ github.base_ref == '' }} PREV_SHA: ${{ github.event.before }} TARGET_BRANCH: ${{ github.base_ref }} + FALLBACK_BRANCH: 'origin/develop' steps: - name: Checkout code uses: actions/checkout@v1 @@ -40,7 +41,7 @@ jobs: with: bundler-cache: true - name: Lint changed files - run: bin/rubocop-ci ${{ env.TARGET_BRANCH || env.PREV_SHA }} ${{ env.IS_MERGE }} + run: bin/rubocop-ci ${{ env.TARGET_BRANCH || env.PREV_SHA || env.FALLBACK_BRANCH }} ${{ env.IS_MERGE }} rspec: name: RSpec needs: [audits, rubocop] diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8d9fd7697..ef32e0ade 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -25,7 +25,7 @@ <%= yield %> diff --git a/app/views/layouts/setup.html.erb b/app/views/layouts/setup.html.erb index 0e8a24167..054b6db28 100644 --- a/app/views/layouts/setup.html.erb +++ b/app/views/layouts/setup.html.erb @@ -23,7 +23,7 @@ <%= yield %> - + diff --git a/app/views/layouts/tylium/navbar/_help.html.erb b/app/views/layouts/tylium/navbar/_help.html.erb index 94bb6dc2f..6295de67c 100644 --- a/app/views/layouts/tylium/navbar/_help.html.erb +++ b/app/views/layouts/tylium/navbar/_help.html.erb @@ -5,8 +5,8 @@