Skip to content

Commit

Permalink
Merge pull request #247 from fnf-org/mfl/car-camping
Browse files Browse the repository at this point in the history
Mfl/car camping
  • Loading branch information
beingmattlevy authored Jul 30, 2024
2 parents 42562fd + bcc6770 commit f1bd2fc
Show file tree
Hide file tree
Showing 80 changed files with 1,480 additions and 1,527 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: "Create and migrate the DB"
run: |
bin/rails db:create
bin/rails db:migrate
bin/rails db:migrate:with_data
bin/rails db:test:prepare
- name: "Run Rspec"
Expand Down
6 changes: 6 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ Rails/BulkChangeTable:
- 'db/migrate/20140605045004_extract_address_into_multiple_fields.rb'
- 'db/migrate/20140616030905_change_camping_type_on_ticket_requests.rb'
- 'db/migrate/20160611234315_add_eald_columns.rb'
- 'db/migrate/20240728211432_remove_ea_ld.rb'
- 'db/migrate/20240728223048_event_prices_as_integers.rb'
- 'db/migrate/20240729210234_ticket_requests_cleanup.rb'

# Offense count: 3
# Configuration parameters: Include.
Expand Down Expand Up @@ -157,6 +160,9 @@ Rails/ReversibleMigration:
- 'db/migrate/20140605053705_remove_ask_how_many_shifts_from_events.rb'
- 'db/migrate/20140605060026_add_camping_type_to_ticket_requests.rb'
- 'db/migrate/20140616030905_change_camping_type_on_ticket_requests.rb'
- 'db/migrate/20240728211432_remove_ea_ld.rb'
- 'db/migrate/20240728223048_event_prices_as_integers.rb'
- 'db/migrate/20240729210234_ticket_requests_cleanup.rb'

# Offense count: 3
# Configuration parameters: ForbiddenMethods, AllowedMethods.
Expand Down
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.3
1.3.0
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ source 'https://rubygems.org'
ruby File.read('.ruby-version')

# Use main development branch of Rails
gem 'rails', '=7.1.3.2'
gem 'data_migrate'
gem 'rails', '=7.1.3.4'

# Unclear if we need to require it explicitly
# gem 'activesupport', '=7.1.3.2'
Expand Down Expand Up @@ -95,7 +96,7 @@ group :development, :test do
gem 'rubocop-rails'
gem 'rubocop-rails-omakase', require: false
gem 'rubocop-rake'
gem 'rubocop-rspec'
gem 'rubocop-rspec', '~> 2.29.2'
end

group :development do
Expand Down
Loading

0 comments on commit f1bd2fc

Please sign in to comment.