Merge branch 'master' into hsbc_uk_icon

.github/workflows/ruby-ci.yml

@@ -17,32 +17,35 @@ jobs:
     strategy:
       matrix:
         version:
-          - 2.5
           - 2.6
           - 2.7
           - 3.0
           - 3.1
+          - 3.2
         gemfile:
-          - gemfiles/rails-5-0.gemfile
+          - gemfiles/rails-6-0.gemfile
           - gemfiles/rails-latest-release.gemfile
           - gemfiles/rails-edge.gemfile
         exclude:
-          - version: 2.5
-            gemfile: gemfiles/rails-edge.gemfile
           - version: 2.6
             gemfile: gemfiles/rails-edge.gemfile
+          - version: 2.7
+            gemfile: gemfiles/rails-edge.gemfile
           - version: 3.0
-            gemfile: gemfiles/rails-5-0.gemfile
+            gemfile: gemfiles/rails-6-0.gemfile
           - version: 3.1
-            gemfile: gemfiles/rails-5-0.gemfile
+            gemfile: gemfiles/rails-6-0.gemfile
+          - version: 3.2
+            gemfile: gemfiles/rails-6-0.gemfile
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Ruby ${{ matrix.version }}
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.version }}
           bundler-cache: true
+          rubygems: latest
 
       - name: Test
         run: bundle exec rake test

CONTRIBUTING.md

@@ -13,7 +13,15 @@ To add a new payment method icon to this repository:
     - `other`
     - `wallets`
 
-4. Add an SVG icon to the `app/assets/images/payment_icons/` directory following the [guidelines for new icons](#guidelines-for-new-icons).
+4. Add an SVG icon to the `app/assets/images/payment_icons/` directory following the [guidelines for new icons](#guidelines-for-new-icons). If you are adding a generic payment method, you may use the following generic icons.
+
+    - [`cash`](https://github.com/activemerchant/payment_icons/blob/master/app/assets/images/payment_icons/cash.svg)
+    - [`generic`](https://github.com/activemerchant/payment_icons/blob/master/app/assets/images/payment_icons/generic.svg)
+    - [`gift-card`](https://github.com/activemerchant/payment_icons/blob/master/app/assets/images/payment_icons/gift-card.svg)
+    - [`onlinebanking`](https://github.com/activemerchant/payment_icons/blob/master/app/assets/images/payment_icons/onlinebanking.svg)
+    - [`storecredit`](https://github.com/activemerchant/payment_icons/blob/master/app/assets/images/payment_icons/storecredit.svg)
+    - [`wallet`](https://github.com/activemerchant/payment_icons/blob/master/app/assets/images/payment_icons/wallet.svg)
+
 5. Optimize your icon using [SVGO](https://github.com/svg/svgo) (`v1.x.x`) - instructions below.
 
     ```
@@ -59,6 +67,9 @@ All icon contributions must follow the guidelines below. The **markup** guidelin
 - Icons are clear and easy to read/understand
 - Whenever possible, provide a link to the brand icon’s brand guidelines (e.g. [Google Pay](https://developers.google.com/pay/api/web/guides/brand-guidelines))
 
+### Name
+- The name entered in `db/payment_icons.yml` must be lowercase alpha characters only.
+
 ### File
 - The name of the SVG must be the same as the `name` entered in `db/payment_icons.yml`