Commit graph

4256 commits

Author SHA1 Message Date
Jimmy
6e3cdc2614 [test] Add test for auto-redirect 2021-03-04 22:05:55 -08:00
Jimmy
da8939dd3a [feat] remove unintended check; add auto-redirect to non-free ticket 2021-03-04 21:50:26 -08:00
Jimmy
1ca58961c1 [style] Rubocop 2021-03-04 16:34:47 -08:00
Jimmy
a599980046 [fix] Fix check for non-free tickets 2021-03-04 16:32:36 -08:00
Jimmy
7d70462542 [refactor] Clean up unused code 2021-03-04 15:47:48 -08:00
Jimmy
189c2ec75f [fix] Fix user.count_registration_tickets 2021-03-04 15:34:06 -08:00
rajavi-mishra
b72dfdabf8 conditions completed 2021-03-04 11:55:45 -08:00
Jimmy
7e37b52e20 temp 2021-03-04 11:37:16 -08:00
Jimmy
c1fe73df03 temp 2021-03-04 11:33:27 -08:00
depfu[bot]
dee3e8ad23
Update puma to version 5.2.2 2021-03-04 11:06:08 +00:00
depfu[bot]
1133dcb30b
Update rails-controller-testing to version 1.0.5 2021-03-04 10:46:20 +00:00
Michael Ball
4900f0c14a
Merge pull request #101 from snap-cloud/depfu/update/dotenv-rails-2.7.6
Update dotenv-rails: 2.7.5 → 2.7.6 (patch)
2021-03-04 02:44:46 -08:00
Michael Ball
cd74abc07e
Merge pull request #105 from snap-cloud/depfu/update/font-awesome-rails-4.7.0.7
Update font-awesome-rails: 4.7.0.5 → 4.7.0.7 (patch)
2021-03-04 02:44:24 -08:00
Michael Ball
d5796619c9
Merge pull request #106 from snap-cloud/fix-carrierwave
Fix carrierwave
2021-03-04 02:42:14 -08:00
Michael Ball
ea6a29e667 Add cache_storage config for carrierwave 2 2021-03-04 01:41:49 -08:00
Michael Ball
072ca83052 Add pry-byebug gem 2021-03-04 01:39:46 -08:00
rajavi-mishra
8c230352f9 added more conditions 2021-03-03 13:58:36 -08:00
Jimmy
48a689d452 temp 2021-03-03 13:29:54 -08:00
rajavi-mishra
3f7f5b6bf4 change to conditions 2021-03-03 13:06:38 -08:00
CactusPuppy
cfbb3bc36f
Merge pull request #13 from CactusPuppy/depfu/update/cocoon-1.2.15
Update cocoon: 1.2.14 → 1.2.15 (patch)
2021-03-03 12:17:42 -08:00
depfu[bot]
92a781a595
Update font-awesome-rails to version 4.7.0.7 2021-03-03 06:16:49 +00:00
Michael Ball
634273e3ab
Merge pull request #104 from CactusPuppy/master
Iteration 1 & 2 tasks
2021-03-02 22:13:53 -08:00
depfu[bot]
5e0848ef4e
Update cocoon to version 1.2.15 2021-03-03 06:04:48 +00:00
Michael Ball
c18531ca21
Merge branch 'master' into master 2021-03-02 21:59:34 -08:00
Michael Ball
d067221f57 Show all conferences by default on Conferences#index 2021-03-02 20:46:35 -08:00
Michael Ball
d40ab944c2 Render conference md without escaping description html 2021-03-02 20:46:14 -08:00
Michael Ball
61ce7073de
Merge pull request #103 from snap-cloud/michael/fix-contact-link-styling
Fixup the last trapeziod on social media section
2021-03-02 20:07:52 -08:00
Michael Ball
06b05b8177 Fixup the last trapeziod on social media section 2021-03-02 18:55:41 -08:00
depfu[bot]
a304780459
Update dotenv-rails to version 2.7.6 2021-03-03 00:36:15 +00:00
CactusPuppy
abe017fc4e
Make 'all' option actually fire all rspec tests 2021-03-02 15:09:34 -08:00
Michael Ball
5827861ed2
Merge pull request #95 from snap-cloud/depfu/update/codecov-0.5.0
Update codecov: 0.2.11 → 0.5.0 (major)
2021-03-02 14:39:56 -08:00
Michael Ball
8eaf1e0a61
Merge pull request #90 from snap-cloud/depfu/update/puma-5.2.1
🚨 [security] Upgrade puma: 3.12.6 → 5.2.1 (major)
2021-03-02 14:38:08 -08:00
depfu[bot]
27b0022a88
Update codecov to version 0.5.0 2021-03-02 22:16:32 +00:00
Michael Ball
31f81a6661
Merge pull request #94 from snap-cloud/why-the-heck-cant-i-build-on-travis-🍊🍊
Why the heck cant i build on travis 🍊🍊
2021-03-02 13:56:10 -08:00
CactusPuppy
d63cfb6d5c
Merge pull request #5 from CactusPuppy/depfu/update/chartkick-3.4.2
Update chartkick: 3.4.0 → 3.4.2 (patch)
2021-03-02 10:45:30 -08:00
depfu[bot]
f913d69ca9
Update chartkick to version 3.4.2 2021-03-02 10:32:40 -08:00
CactusPuppy
a76d5f2122
Merge pull request #8 from CactusPuppy/depfu/update/carrierwave-2.2.0
🚨 [security] Update carrierwave: 1.3.2 → 2.2.0 (major)
2021-03-02 10:20:28 -08:00
CactusPuppy
207046dc65
Merge pull request #11 from CactusPuppy/176894810/add_summision_text
Add submission text to event proposals
2021-03-01 23:38:06 -08:00
CactusPuppy
54a5f84d8b
Prefer single-quoted strings 2021-03-01 23:01:28 -08:00
CactusPuppy
30ec69282d
Fix '==' instead of assignment operator 2021-03-01 23:00:04 -08:00
CactusPuppy
c8e6dc86d7
Increase test coverage to stop codecov from complaining 2021-03-01 22:56:45 -08:00
lzy-1006
9ee29f6daa
Merge pull request #12 from CactusPuppy/176895037-add-link-to-view-event-from-admin-page
Add link to view event from admin page
2021-03-01 21:45:32 -08:00
CactusPuppy
626eaee761
Remove unnecessary self 2021-02-27 23:03:29 -08:00
CactusPuppy
16f5ed6138
Refactor calculation of submission limit and abstract limit into helper function 2021-02-27 22:54:35 -08:00
CactusPuppy
f207d070ac
Add spec for submission limits 2021-02-27 11:29:27 -08:00
CactusPuppy
0aa33c497c
Ensure that user is actually guest when testing 2021-02-27 11:25:37 -08:00
CactusPuppy
b94894fe87
Update annotate_models 2021-02-26 11:04:20 -08:00
CactusPuppy
974d12db30
Fix some rubocop complaints 2021-02-25 20:30:27 -08:00
CactusPuppy
42d43319c5
fix indentation error 2021-02-25 20:12:20 -08:00
Michael Ball
fa85205d27 Cleanup travis a bit, add postgres, but its not used yet... 2021-02-25 15:52:51 -08:00