gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4614 commits 2 branches 2 tags 50 MiB
Commit graph

4614 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Ball
4d1edf5872 Merge branch 'delint' 
* delint:
  Hide stuff again on admin conf show
  update snapcon logo
  more delinting
  Delint event page
  Delint by re-enabling everying on the conference admin page
 2021-03-21 12:53:52 -07:00
Michael Ball
6f2525efcf
Merge pull request #111 from snap-cloud/depfu/update/awesome_nested_set-3.4.0 
Update awesome_nested_set: 3.2.1 → 3.4.0 (minor)
 2021-03-21 12:49:54 -07:00
Michael Ball
481375f59d
Merge pull request #110 from snap-cloud/depfu/update/active_model_serializers-0.10.12 
Update active_model_serializers: 0.10.10 → 0.10.12 (minor)
 2021-03-21 12:48:46 -07:00
Michael Ball
f26605d417
Merge pull request #99 from snap-cloud/depfu/update/delayed_job_active_record-4.1.5 
Update delayed_job_active_record: 4.1.4 → 4.1.5 (patch)
 2021-03-21 12:47:36 -07:00
Michael Ball
45fcd81093
Merge pull request #92 from snap-cloud/depfu/update/pg-1.2.3 
Update pg: 1.1.4 → 1.2.3 (minor)
 2021-03-21 12:47:02 -07:00
Jimmy
bfc39fdbe4 [feat] happening_now json endpoint returns event embedded in event_schedule 2021-03-20 13:34:14 +08:00
Jimmy
1ab580e7e6 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895124-happening-now-json-api-endpoint 2021-03-19 17:23:47 +08:00
Jimmy
3019a022c7 [fix] Fix style; Fix start_hour and end_hour in test 2021-03-19 17:22:08 +08:00
Jimmy
1c54d38094 [fix] Fix time displayed in happening_now.haml; Make event_schedule#happening_now? more efficient 2021-03-19 17:13:34 +08:00
CactusPuppy
9f558c68c2
Merge pull request #38 from CactusPuppy/fix-heroku-deploy 
Fix Heroku deploys
 2021-03-19 01:39:49 -07:00
CactusPuppy
8110d06ca7
Fix Rubocop linting issue 2021-03-19 01:26:53 -07:00
CactusPuppy
33af94badd
Allow ES6 JS syntax 2021-03-19 01:22:22 -07:00
CactusPuppy
28e45d6162
Revert "Avoid using ES6 syntax to prevent Heroku asset compilation from failing" 
This reverts commit f5a8587b4c.
 2021-03-19 01:21:26 -07:00
CactusPuppy
f5a8587b4c
Avoid using ES6 syntax to prevent Heroku asset compilation from failing 2021-03-19 01:16:43 -07:00
CactusPuppy
12f4b75e16
Merge pull request #35 from CactusPuppy/fix-ci 
Fix continuous integration pipeline
 2021-03-19 00:55:48 -07:00
CactusPuppy
8adc70ffa8
Ensure sqlite isn't trying to be loaded on Heroku 2021-03-19 00:31:14 -07:00
CactusPuppy
8b7f0551ae
Only upload coverage reports from Travis if based in master 2021-03-18 23:48:06 -07:00
CactusPuppy
9167f2f2e6
Unpend test because I guess it works on Travis 2021-03-18 23:21:51 -07:00
CactusPuppy
e51dcc6d05
Pend test so that error is exposed instead of skipping 2021-03-18 23:01:54 -07:00
CactusPuppy
4fbe48692e
Actually run rest tests instead of features twice 2021-03-18 23:01:24 -07:00
CactusPuppy
6fed679644
Merge branch 'return-to-code-climate-coverage' into fix-ci 2021-03-18 20:47:14 -07:00
CactusPuppy
652381a0b8
Update annotate_models comments 2021-03-18 20:36:39 -07:00
CactusPuppy
ee8de1ce2d
Temp pend failing test, as it does not reflect local verification 2021-03-18 20:32:58 -07:00
CactusPuppy
039a931c90
Ensure coverage.xml is generated on Travis 2021-03-18 20:32:57 -07:00
CactusPuppy
2e9150887e
Prevent overwriting of jobs by matrix 2021-03-18 20:32:57 -07:00
CactusPuppy
9ad9a24d74
Actually properly report parallel stages 2021-03-18 20:32:56 -07:00
CactusPuppy
c4e07e858f
Fix minor typo in .travis.yml 2021-03-18 20:32:56 -07:00
CactusPuppy
3b768dda4b
Specify where the coverage report is 2021-03-18 20:32:55 -07:00
CactusPuppy
d8168559be
Switch to using Codacy for code coverage (following OSEM example) 2021-03-18 20:32:55 -07:00
CactusPuppy
89149d53d6
Switch CodeCov badge to Code Climate badge 2021-03-18 20:32:54 -07:00
CactusPuppy
4989b0e4e9
Avoid installing Ruby in finalize stage 2021-03-18 17:23:12 -07:00
CactusPuppy
554f897b27
Ensure finalize stage does not have unecessary installation to do 2021-03-18 17:16:28 -07:00
CactusPuppy
fb741ca28d
Restore Code Coverage badge 2021-03-18 16:44:38 -07:00
CactusPuppy
f5b9806aca
Correct path to Cobertura output 2021-03-18 16:32:45 -07:00
CactusPuppy
1c0b477c1b
Try using Cobertura output instead of resultset.json 2021-03-18 16:24:01 -07:00
CactusPuppy
728b6084f9
Try CodeClimate reporting again 2021-03-18 16:10:24 -07:00
kingdish
81e12d5e60
Merge pull request #33 from CactusPuppy/177195121-improve-email-templates 
Improve email templates
 2021-03-18 04:14:12 -07:00
Jimmy
cab293e947 [fix] Fix event_schedule# happening_now?; Add tests for happening_now JSON endpoint 2021-03-18 18:53:55 +08:00
CactusPuppy
8f1df20c54
Properly format jobs list 2021-03-17 20:41:13 -07:00
CactusPuppy
8342b4c283
Try an experimental .travis.yml which uploads coverage to CodeClimate 2021-03-17 20:38:14 -07:00
Jimmy
d6e161b7e5 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895124-happening-now-json-api-endpoint 2021-03-18 08:41:41 +08:00
Jimmy
362853f4df Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 177195121-improve-email-templates 2021-03-18 08:40:49 +08:00
CactusPuppy
c7482bef1b
Ensure coverage.xml is generated on Travis 2021-03-17 16:14:33 -07:00
CactusPuppy
0e28b5694a
Prevent overwriting of jobs by matrix 2021-03-17 15:56:50 -07:00
CactusPuppy
1a56c9c984
Actually properly report parallel stages 2021-03-17 15:50:37 -07:00
CactusPuppy
9357c71eee
Fix minor typo in .travis.yml 2021-03-17 14:27:25 -07:00
CactusPuppy
584e5827a1
Specify where the coverage report is 2021-03-17 14:25:43 -07:00
CactusPuppy
fd0931f9c2
Switch to using Codacy for code coverage (following OSEM example) 2021-03-17 14:12:29 -07:00
CactusPuppy
1936e43735
Switch CodeCov badge to Code Climate badge 2021-03-17 11:42:06 -07:00
CactusPuppy
7f13c5a4c7
Merge pull request #34 from CactusPuppy/fix-ci 
Make CI green... again.
 2021-03-17 11:19:52 -07:00