From 9b1489579e1c05a0a1e464a26024f0b71945a3d2 Mon Sep 17 00:00:00 2001
From: Marc-Andre Lafortune <github@marc-andre.ca>
Date: Fri, 6 Nov 2020 18:53:20 -0500
Subject: [PATCH] Remove os from rule names. Update mergify

---
 .github/workflows/rubocop.yml |  2 +-
 .mergify.yml                  | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index dafae6d85..2cbe5efe0 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -8,7 +8,7 @@ on: [push, pull_request]
 jobs:
   ast_specs:
     name: >-
-      ${{ matrix.title || 'Specs' }} | ${{ matrix.ruby }} (${{ matrix.os }})
+      ${{ matrix.title || 'Specs' }} | ${{ matrix.ruby }}
     runs-on: ${{ matrix.os }}-latest
     env:
       # See https://github.com/tmm1/test-queue#environment-variables
diff --git a/.mergify.yml b/.mergify.yml
index 95628a024..fce467024 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -8,22 +8,22 @@ pull_request_rules:
       - label=auto-merge
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"
-      - 'status-success=Specs | 2.4 (ubuntu)'
-      - 'status-success=Specs | 2.5 (ubuntu)'
-      - 'status-success=Specs | 2.6 (ubuntu)'
-      - 'status-success=Specs | 2.7 (ubuntu)'
-      - 'status-success=Specs | head (ubuntu)'
-      - 'status-success=Specs | mingw (windows)'
-      - 'status-success=Coverage | 2.4 (ubuntu)'
-      - 'status-success=Specs "modern" | 2.7 (ubuntu)'
-      - 'status-success=Specs | jruby (ubuntu)'
-      - 'status-success=Specs | truffleruby (ubuntu)'
-      - 'status-success=Specs | truffleruby-head (ubuntu)'
-      - 'status-success=Main Gem Specs | RuboCop: 0.92.0 | 2.4 (ubuntu)'
-      - 'status-success=Main Gem Specs | RuboCop: master | 2.4 (ubuntu)'
-      - 'status-success=Main Gem Specs | RuboCop: 0.92.0 | 2.7 (ubuntu)'
-      - 'status-success=Main Gem Specs | RuboCop: master | 2.7 (ubuntu)'
-      - 'status-success=Coding Style | 2.7 (ubuntu)'
+      - 'status-success=Specs | 2.4'
+      - 'status-success=Specs | 2.5'
+      - 'status-success=Specs | 2.6'
+      - 'status-success=Specs | 2.7'
+      - 'status-success=Specs | head'
+      - 'status-success=Specs | mingw'
+      - 'status-success=Coverage | 2.4'
+      - 'status-success=Specs "modern" | 2.7'
+      - 'status-success=Specs | jruby'
+      - 'status-success=Specs | truffleruby'
+      - 'status-success=Specs | truffleruby-head'
+      - 'status-success=Main Gem Specs | RuboCop: 0.92.0 | 2.4'
+      - 'status-success=Main Gem Specs | RuboCop: master | 2.4'
+      - 'status-success=Main Gem Specs | RuboCop: 0.92.0 | 2.7'
+      - 'status-success=Main Gem Specs | RuboCop: master | 2.7'
+      - 'status-success=Coding Style | 2.7'
 
   - name: delete head branch after auto-merge
     conditions: