Skip to content

Commit

Permalink
Merge branch 'faker-ruby:main' into crypto-performance
Browse files Browse the repository at this point in the history
  • Loading branch information
alextaujenis committed Apr 22, 2024
2 parents 7d416d6 + 1245daa commit 6814f62
Show file tree
Hide file tree
Showing 8 changed files with 941 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Expand Up @@ -8,11 +8,12 @@ gemspec
gem 'benchmark'
gem 'minitest', '5.22.3'
gem 'pry', '0.14.2'
gem 'rake', '13.1.0'
gem 'rake', '13.2.1'
gem 'rubocop', '1.62.1'
gem 'rubocop-minitest', '0.35.0'
gem 'rubocop-rake', '0.6.0'
gem 'simplecov', '0.22.0'
gem 'test-unit', '3.6.2'
gem 'timecop', '0.9.8'
gem 'tzinfo', '2.0.6'
gem 'yard', '0.9.36'
7 changes: 5 additions & 2 deletions Gemfile.lock
Expand Up @@ -28,7 +28,7 @@ GEM
method_source (~> 1.0)
racc (1.7.3)
rainbow (3.1.1)
rake (13.1.0)
rake (13.2.1)
regexp_parser (2.9.0)
rexml (3.2.6)
rubocop (1.62.1)
Expand Down Expand Up @@ -59,6 +59,8 @@ GEM
test-unit (3.6.2)
power_assert
timecop (0.9.8)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
yard (0.9.36)

Expand All @@ -71,13 +73,14 @@ DEPENDENCIES
faker!
minitest (= 5.22.3)
pry (= 0.14.2)
rake (= 13.1.0)
rake (= 13.2.1)
rubocop (= 1.62.1)
rubocop-minitest (= 0.35.0)
rubocop-rake (= 0.6.0)
simplecov (= 0.22.0)
test-unit (= 3.6.2)
timecop (= 0.9.8)
tzinfo (= 2.0.6)
yard (= 0.9.36)

BUNDLED WITH
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -486,9 +486,9 @@ gem 'faker', :git => 'https://github.com/faker-ruby/faker.git', :branch => 'main

## Contributing

**Note**: We are not accepting proposals for new generators and locales. The [Contributing](CONTRIBUTING.md) guide has a few notes about this decision.
**Note**: We are not accepting proposals for new generators and locales. The [Contributing](https://github.com/faker-ruby/faker/blob/main/CONTRIBUTING.md) guide has a few notes about this decision.

Take a look at the [Contributing](CONTRIBUTING.md) document for
Take a look at the [Contributing](https://github.com/faker-ruby/faker/blob/main/CONTRIBUTING.md) document for
instructions on setting up the repo on your machine, opening bug reports, understanding the codebase,
and creating a good pull request.

Expand Down
2 changes: 1 addition & 1 deletion lib/locales/en/address.yml
Expand Up @@ -1717,7 +1717,7 @@ en:
- America/Godthab
- Atlantic/South_Georgia
- Atlantic/Azores
- Atlantic/Cabo_Verde
- Atlantic/Cape_Verde
- Europe/Dublin
- Europe/London
- Europe/Lisbon
Expand Down
3 changes: 2 additions & 1 deletion lib/locales/en/food.yml
Expand Up @@ -455,7 +455,8 @@ en:
- Pumpkin Seed
- Purple Carrot
- Purple Rice
- Quark Quinc
- Quark
- Quince
- Quinoa
- Radicchio
- Radish
Expand Down

0 comments on commit 6814f62

Please sign in to comment.