diff --git a/.github/workflows/plugin-linting.yml b/.github/workflows/plugin-linting.yml index 17864e9..affe103 100644 --- a/.github/workflows/plugin-linting.yml +++ b/.github/workflows/plugin-linting.yml @@ -20,13 +20,10 @@ jobs: node-version: 12 - name: Set up ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: 2.7 - - name: Setup bundler - run: gem install bundler -v 2.1.4 --no-doc - - name: Setup gems run: bundle install --jobs 4 @@ -46,5 +43,8 @@ jobs: yarn prettier --list-different "test/**/*.{js,es6}" ; \ fi + - name: Ember template lint + run: yarn ember-template-lint assets/javascripts + - name: Rubocop run: bundle exec rubocop . diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml index bee02fb..ad05806 100644 --- a/.github/workflows/plugin-tests.yml +++ b/.github/workflows/plugin-tests.yml @@ -10,7 +10,7 @@ on: jobs: build: name: ${{ matrix.build_type }} - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest timeout-minutes: 60 env: @@ -26,8 +26,7 @@ jobs: matrix: build_type: ["backend", "frontend"] - os: [ubuntu-latest] - ruby: ["2.6"] + ruby: ["2.7"] postgres: ["12"] redis: ["4.x"] @@ -47,13 +46,13 @@ jobs: --health-retries 5 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 with: repository: discourse/discourse fetch-depth: 1 - name: Install plugin - uses: actions/checkout@master + uses: actions/checkout@v2 with: path: plugins/${{ github.event.repository.name }} fetch-depth: 1 @@ -94,27 +93,14 @@ jobs: redis-version: ${{ matrix.redis }} - name: Setup ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} + bundler-cache: true - - name: Setup bundler - run: | - gem install bundler -v 2.1.4 --no-doc - bundle config deployment 'true' - bundle config without 'development' - - - name: Bundler cache - uses: actions/cache@v2 - id: bundler-cache - with: - path: vendor/bundle - key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - ${{ runner.os }}-gem- - - - name: Setup gems - run: bundle install --jobs 4 + - name: Lint English locale + if: matrix.build_type == 'backend' + run: bundle exec ruby script/i18n_lint.rb "plugins/${{ github.event.repository.name }}/locales/{client,server}.en.yml" - name: Get yarn cache directory id: yarn-cache-dir diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-channel-error.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-channel-error.hbs index 3c0cea7..dec200d 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-channel-error.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-channel-error.hbs @@ -1,4 +1,4 @@ {{#d-modal-body id="chat_integration_error_modal"}} -
{{model.error_info}}-{{/d-modal-body}} \ No newline at end of file +
{{model.error_info}}+{{/d-modal-body}} diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-channel.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-channel.hbs index 1b3a3df..b769f62 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-channel.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-channel.hbs @@ -2,54 +2,58 @@
{{i18n "chat_integration.rule_table.filter"}} | -{{i18n "chat_integration.rule_table.category"}} | + +||||||
---|---|---|---|---|---|---|---|
{{i18n "chat_integration.rule_table.filter"}} | +{{i18n "chat_integration.rule_table.category"}} | - {{#if siteSettings.tagging_enabled}} -{{i18n "chat_integration.rule_table.tags"}} | - {{/if}} + {{#if siteSettings.tagging_enabled}} +{{i18n "chat_integration.rule_table.tags"}} | + {{/if}} -- | + + - {{#each channel.rules as |rule|}} - {{rule-row rule=rule edit=(action "editRule") refresh=refresh}} - {{/each}} + |