Skip to content

Commit 1868b87

Browse files
authored
Merge branch 'main' into fix-money-only-cents-for-negative-money
2 parents 9363e10 + 0815c28 commit 1868b87

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

.github/workflows/ruby.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
22+
ruby-version: ['3.0', '3.1', '3.2', '3.3']
2323
mongodb-version: ['4.4']
2424
sqlite-version: ['3.0']
2525

2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
- name: Set up Ruby
2929
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
3030
# change this to (see https://github.com/ruby/setup-ruby#versioning):

money-rails.gemspec

+1
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ Gem::Specification.new do |s|
4242
s.metadata['changelog_uri'] = 'https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md'
4343
s.metadata['source_code_uri'] = 'https://github.com/RubyMoney/money-rails/'
4444
s.metadata['bug_tracker_uri'] = 'https://github.com/RubyMoney/money-rails/issues'
45+
s.metadata['rubygems_mfa_required'] = 'true'
4546
end
4647
end

spec/configuration_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
value = Money.new(-12345600, "EUR")
7777
symbol = Money::Currency.find(:eur).symbol
7878

79-
MoneyRails.default_format = {symbol_position: :after}
79+
MoneyRails.default_format = { format: '%n%u' }
8080
expect(value.format).to match(/#{symbol}\z/)
8181

8282
# Override with "classic" format options for backward compatibility

spec/dummy/config/initializers/money.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# encoding : utf-8
22

33
MoneyRails.configure do |config|
4+
Money.locale_backend = :i18n
5+
Money.rounding_mode = BigDecimal::ROUND_HALF_UP
46

57
# To set the default currency
68
#

0 commit comments

Comments
 (0)