Commit graph

4171 commits

Author SHA1 Message Date
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
Michael Ball
c6640c0de2 Update travis config. Try bionic build. 2021-02-25 14:15:10 -08:00
Jimmy
05f877cfe5 [test] Add tests for previewing proposal in admin page 2021-02-25 11:15:23 -08:00
Michael Ball
6cb8fe3787 Comment out all codeclimate references 2021-02-25 01:51:55 -08:00
Michael Ball
56042226a1 CodeClimate isnt quite configured right... 2021-02-25 01:28:07 -08:00
depfu[bot]
1a03b3e8cc
Update carrierwave to version 2.2.0 2021-02-25 08:13:40 +00:00
kingdish
56d93fa381
Merge pull request #7 from CactusPuppy/176917559-add-brand-elements-to-email
Add brand elements to email
2021-02-25 00:08:32 -08:00
CactusPuppy
d46e1e7397
Add JavaScript to make placeholder text update along with word count 2021-02-24 23:41:19 -08:00
madhekare
16d9dfef4c
submission_text rspec 2021-02-24 23:41:19 -08:00
madhekare
b8f531783b
submission text control/model modifications 2021-02-24 23:41:18 -08:00
madhekare
baf488ad8a
sumbission text views 2021-02-24 23:41:18 -08:00
madhekare
46fa17b55c
submission_text field migration 2021-02-24 23:41:18 -08:00
Michael Ball
705cc469de Update badges in README 2021-02-24 23:03:19 -08:00
depfu[bot]
2e6e60d568
Update puma to version 5.2.1 2021-02-25 06:58:49 +00:00
Michael Ball
8238ff03be CodeClimate Test Reporter from Travis 2021-02-24 22:47:51 -08:00
Michael Ball
9d3043d810 Rails 5.2 is only good on Ruby 2.6. Will not run other versions until upgrade 2021-02-24 22:29:41 -08:00
Michael Ball
e7c564fc21 Merge branch 'master' into michael/ruby-versions
* master:
2021-02-24 22:26:01 -08:00
Jimmy
4ee70899f5 [fix] Fix style 2021-02-24 22:17:47 -08:00
Michael Ball
f10139efeb Update badges and readme slightly 2021-02-24 22:11:32 -08:00
Jimmy
e44714b06b Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176917559-add-brand-elements-to-email 2021-02-24 22:08:12 -08:00
Jimmy
92d052970a Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895037-add-link-to-view-event-from-admin-page 2021-02-24 22:07:38 -08:00
CactusPuppy
88373a7f47
Merge pull request #10 from CactusPuppy/176879873-fix-travis-tests
Turn CI green
2021-02-24 22:06:41 -08:00
Michael Ball
2d1a599340 Specify ruby version in Gemfile in a way that works for Heroku + Travis 2021-02-24 22:06:10 -08:00
Michael Ball
2501851c95 Merge branch 'temp' into michael/ruby-versions
* temp:
  Update sentry logging
2021-02-24 21:56:00 -08:00
Michael Ball
1b056aa47f
Merge pull request #88 from snap-cloud/temp
Add Sentry Pref Logging
2021-02-24 21:55:50 -08:00
Michael Ball
ad514b8908
Add a flay ignore file 2021-02-24 21:44:03 -08:00
Michael Ball
9abaf38e5a
Delint from a local pronto run 2021-02-24 21:44:02 -08:00
Michael Ball
ee2aec90c9 Switch travis OS to 20.04 / focal to match Heroku 2021-02-24 21:41:39 -08:00
Michael Ball
7e5e2d9e3d Bump ruby matrix on travis 2021-02-24 21:41:16 -08:00
Michael Ball
cf22b5c9f4 Bump ruby version to 2.6.6 2021-02-24 21:39:10 -08:00
CactusPuppy
5f9f451dda
Merge branch 'master' into 176879873-fix-travis-tests 2021-02-24 21:35:59 -08:00
CactusPuppy
27fa018670
Merge branch 'master' into 176879873-fix-travis-tests 2021-02-24 21:27:00 -08:00
Michael Ball
413e4f94bf Merge branch 'master' of https://git.heroku.com/snapcon into temp
* 'master' of https://git.heroku.com/snapcon:
  Update sentry logging
2021-02-24 21:26:38 -08:00
Michael Ball
86133d7fbe
Merge pull request #87 from snap-cloud/michael/delint
Setup Pronto and Try Some Delints
2021-02-24 21:25:33 -08:00
CactusPuppy
50675c8dbe
Fix a minor typo with spec description 2021-02-24 20:55:59 -08:00
Michael Ball
807fbab3b6 Add a flay ignore file 2021-02-24 20:55:59 -08:00