Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mfl/car camping #247

Merged
merged 71 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
62ef4cb
wording changes for CFAEA
beingmattlevy Jul 17, 2024
6b10e61
Move ticket count up
beingmattlevy Jul 17, 2024
5161cc7
Wording
beingmattlevy Jul 17, 2024
5dadfea
delete schema file
beingmattlevy Jul 19, 2024
def5af9
generate addon model
beingmattlevy Jul 21, 2024
e1a5c26
Addon model, specs, relations
beingmattlevy Jul 21, 2024
d1fda0b
annotate and rubocop cleanup
beingmattlevy Jul 21, 2024
cd2695f
fix pluralization
beingmattlevy Jul 21, 2024
7841bba
fix associations
beingmattlevy Jul 21, 2024
e32daee
indentation and event object
beingmattlevy Jul 21, 2024
fb1b6d4
specs
beingmattlevy Jul 21, 2024
ea99991
remove incorrect associations
beingmattlevy Jul 21, 2024
ce45b8a
cleanup
beingmattlevy Jul 21, 2024
e1ca747
event addons
beingmattlevy Jul 24, 2024
f64a66e
spec and rubocop fixes
beingmattlevy Jul 24, 2024
4276694
cleanup
beingmattlevy Jul 25, 2024
4b21e8b
formatting
beingmattlevy Jul 28, 2024
e0000c4
active event addons
beingmattlevy Jul 28, 2024
8187189
ticket request event addons
beingmattlevy Jul 28, 2024
b842e03
formatting
beingmattlevy Jul 28, 2024
49519e2
ticket request event addons forms
beingmattlevy Jul 28, 2024
b8483d9
rubocop cleanup and formatting
beingmattlevy Jul 28, 2024
67e3ce8
humanized category for addons
beingmattlevy Jul 28, 2024
4e6cdbc
pricing for ticket requests
beingmattlevy Jul 28, 2024
80da3bf
spec fix
beingmattlevy Jul 28, 2024
d328ce5
event add ons
beingmattlevy Jul 28, 2024
175ac4e
specs and fixes
beingmattlevy Jul 28, 2024
06be168
cleanup
beingmattlevy Jul 28, 2024
730941f
forms and cleanup
beingmattlevy Jul 28, 2024
852c3ca
remove eald, cabins
beingmattlevy Jul 28, 2024
8126454
eald, cabins removal cleanup
beingmattlevy Jul 28, 2024
473aef2
cleanup
beingmattlevy Jul 28, 2024
b038430
remove duplicate build steps
beingmattlevy Jul 28, 2024
28a473c
convert event ticket prices to integer from decimal
beingmattlevy Jul 28, 2024
3f32b0c
update for event
beingmattlevy Jul 28, 2024
4b6c7a1
cleanup
beingmattlevy Jul 28, 2024
6a107bf
cleanup and fixes
beingmattlevy Jul 28, 2024
f3dbace
cleanup and rubocop
beingmattlevy Jul 28, 2024
2d8428c
Cleanup usability for login and register
beingmattlevy Jul 29, 2024
dc57977
fix association
beingmattlevy Jul 29, 2024
fad3eab
cleanup
beingmattlevy Jul 29, 2024
5d37273
cleanup and usability
beingmattlevy Jul 29, 2024
982b92f
db cleanup of ticket requests
beingmattlevy Jul 29, 2024
8ddef6d
force migrations down
beingmattlevy Jul 29, 2024
ebf0684
bulk changes ok
beingmattlevy Jul 29, 2024
ab06351
usability cleanup
beingmattlevy Jul 29, 2024
da2e992
Add data migrate gem and run it via capistrano
kigster Jul 30, 2024
3ec3702
Add the missing _count method
kigster Jul 30, 2024
88df859
Reorder gems in Gemfile
kigster Jul 30, 2024
ddb1904
Run migrate:with_data in tests
kigster Jul 30, 2024
fc5e375
fixes from review
beingmattlevy Jul 30, 2024
cee1161
clean unused code
beingmattlevy Jul 30, 2024
8fee531
rename for clarity
beingmattlevy Jul 30, 2024
58cd2fc
rename
beingmattlevy Jul 30, 2024
ab888d2
cleanup
beingmattlevy Jul 30, 2024
b10977f
order
beingmattlevy Jul 30, 2024
3b6f1fc
rubocop
beingmattlevy Jul 30, 2024
3767392
clean unused code
beingmattlevy Jul 30, 2024
38787b7
cleanup
beingmattlevy Jul 30, 2024
25069fd
data_migrate
beingmattlevy Jul 30, 2024
6b03207
cleanup
beingmattlevy Jul 30, 2024
364ba22
big nav cleanup
beingmattlevy Jul 30, 2024
6f9a844
cleanup
beingmattlevy Jul 30, 2024
46c109c
bump rails from 7.1.3.2 to 7.1.3.4
beingmattlevy Jul 30, 2024
6da915b
lock rubocop-rspec
beingmattlevy Jul 30, 2024
3de55f4
bump version
beingmattlevy Jul 30, 2024
c787afa
Update gems and lock file
beingmattlevy Jul 30, 2024
d8d4044
correct version
beingmattlevy Jul 30, 2024
8b75220
Cleanup payment confirmation
beingmattlevy Jul 30, 2024
0c9d947
cleanup ticket requests listings
beingmattlevy Jul 30, 2024
bcc6770
rubocop
beingmattlevy Jul 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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