Skip to content

Commit

Permalink
Merge branch 'master' into yape
Browse files Browse the repository at this point in the history
  • Loading branch information
dannye0231 authored Oct 25, 2024
2 parents 52f0dd5 + a3e16c7 commit d0e6a6f
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 24 deletions.
16 changes: 3 additions & 13 deletions .github/workflows/ruby-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,16 @@ jobs:
strategy:
matrix:
version:
- 2.6
- 2.7
- 3.0
- 3.1
- 3.2
- 3.3
gemfile:
- gemfiles/rails-6-0.gemfile
- gemfiles/rails-7-0.gemfile
- gemfiles/rails-latest-release.gemfile
- gemfiles/rails-edge.gemfile
exclude:
- version: 2.6
gemfile: gemfiles/rails-edge.gemfile
- version: 2.7
gemfile: gemfiles/rails-edge.gemfile
- version: 3.0
gemfile: gemfiles/rails-6-0.gemfile
- version: 3.1
gemfile: gemfiles/rails-6-0.gemfile
- version: 3.2
gemfile: gemfiles/rails-6-0.gemfile
gemfile: gemfiles/rails-edge.gemfile
steps:
- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.1.2
ruby-3.3.5
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
payment_icons (1.7.45)
payment_icons (1.7.47)
frozen_record
railties (>= 5.0)
sassc-rails
Expand Down Expand Up @@ -95,10 +95,10 @@ GEM
activemodel
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.14.0)
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
logger (1.6.1)
Expand Down Expand Up @@ -174,7 +174,7 @@ GEM
rake (13.2.1)
rdoc (6.7.0)
psych (>= 4.0.0)
reline (0.5.9)
reline (0.5.10)
io-console (~> 0.5)
sassc (2.4.0)
ffi (~> 1.9)
Expand All @@ -199,7 +199,7 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
useragent (0.16.10)
webrick (1.8.1)
webrick (1.8.2)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down
1 change: 1 addition & 0 deletions app/assets/images/payment_icons/codensa.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/images/payment_icons/fintoc.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/images/payment_icons/rivertypaynlversion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/images/payment_icons/satispay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d0e6a6f

Please sign in to comment.