depfu[bot]
4c11737c40
Update capybara to version 3.35.3
2021-03-09 04:56:48 +00:00
Michael Ball
81060a4d65
Merge pull request #114 from snap-cloud/merge-osem-master
...
Merge osem master
2021-03-08 20:30:40 -08:00
Michael Ball
e311a65f02
Delint Autofix
2021-03-08 16:50:56 -08:00
Michael Ball
f3271f5cdc
Merge master
2021-03-08 16:48:06 -08:00
Michael Ball
743188d162
Merge pull request #107 from snap-cloud/michae/fixup-conferences-index-page
...
Cleanup All Conference Index
2021-03-08 15:56:22 -08:00
Michael Ball
3485a51ff1
Merge pull request #113 from snap-cloud/michael/add-separate-submission-instructions
...
Michael/add separate submission instructions
2021-03-08 15:55:10 -08:00
Michael Ball
fd4d776e2c
datatables specs are passing on this fork!
2021-03-08 11:28:52 -08:00
Michael Ball
a293305fea
Run gh specs even when linters fail....
2021-03-08 03:10:56 -08:00
Michael Ball
4d34817928
Delint
2021-03-08 03:08:03 -08:00
Michael Ball
337a04d4ab
Delint
2021-03-08 03:07:56 -08:00
Michael Ball
f3401c46f8
use 2.6 for github actions
2021-03-08 03:05:01 -08:00
Michael Ball
061cb3e670
regenerate gemfile.lock
2021-03-08 03:04:53 -08:00
Michael Ball
f57da2e9dc
use heroku version for sentry release
2021-03-08 02:58:53 -08:00
Michael Ball
49f77423f8
Fix merge in config/sentry
2021-03-08 02:58:05 -08:00
Michael Ball
d1ca21f479
Merge OSEM updates
2021-03-08 02:50:27 -08:00
Michael Ball
8242eb3338
Remove submission_limit validation for submission_text
2021-03-08 02:18:44 -08:00
Michael Ball
2d1246448c
Add some tests for the submission instructions
2021-03-08 02:13:57 -08:00
Michael Ball
1a24533b00
Display submission instructions on the new/edit forms
2021-03-07 12:56:45 -08:00
Henne Vogelsang
5e70690619
Merge pull request #2740 from differentreality/survey_question_validation
...
Fix JS error when saving survey_question
2021-03-07 14:43:11 +01:00
Henne Vogelsang
26ebdd08b4
Merge pull request #2741 from hellcp/master
...
Don't set venue related values without a venue
2021-03-07 14:39:21 +01:00
Sasi Olin
56838b6eb0
Don't set venue related values without a venue
2021-03-07 10:19:10 +01:00
Stella Rouzi
ee5274b352
Fix JS error when saving survey_question
2021-03-07 07:32:52 +02:00
Henne Vogelsang
6b57c0be05
Merge pull request #2737 from hennevogel/feature/sentry-release
...
Set a release for sentry
2021-03-07 01:34:21 +01:00
Henne Vogelsang
d4e6122ba2
Set a release for sentry
2021-03-07 01:25:06 +01:00
Henne Vogelsang
cee9bc8e14
Merge pull request #2735 from openSUSE/depfu/update/dalli-2.7.11
...
Update dalli: 2.7.10 → 2.7.11 (patch)
2021-03-06 23:55:24 +01:00
depfu[bot]
0291663360
Update dalli to version 2.7.11
2021-03-06 22:45:55 +00:00
Henne Vogelsang
3dfb950b01
Merge pull request #2734 from openSUSE/depfu/update/devise-4.7.3
...
Update devise: 4.7.1 → 4.7.3 (patch)
2021-03-06 23:44:39 +01:00
Henne Vogelsang
441a877ce5
Merge pull request #2733 from hennevogel/feature/sentry
...
Introduces sentry, removes airbrake
2021-03-06 23:24:15 +01:00
Henne Vogelsang
b4b20bd135
Introduces sentry, removes airbrake
...
Sentry is the premiere FOSS error tracking app.
2021-03-06 23:13:59 +01:00
depfu[bot]
ea6111244d
Update devise to version 4.7.3
2021-03-06 22:06:09 +00:00
Henne Vogelsang
ef00a313f5
Merge pull request #2732 from openSUSE/depfu/update/cocoon-1.2.15
...
Update cocoon: 1.2.14 → 1.2.15 (patch)
2021-03-06 23:04:42 +01:00
Henne Vogelsang
3faee06e48
Merge pull request #2731 from hennevogel/bugfix/cloudinary
...
Move cache to file
2021-03-06 22:20:51 +01:00
depfu[bot]
3e7f51a125
Update cocoon to version 1.2.15
2021-03-06 21:10:53 +00:00
Henne Vogelsang
52c61a0c0a
Merge pull request #2730 from openSUSE/depfu/update/dotenv-rails-2.7.6
...
Update dotenv-rails: 2.7.5 → 2.7.6 (patch)
2021-03-06 22:05:20 +01:00
Henne Vogelsang
05adba0e35
Merge pull request #2705 from cycomachead/patch-3
...
Fix Frozen String Error in Commercials Controller
2021-03-06 22:04:48 +01:00
Henne Vogelsang
1291d1846d
Move cache to file
...
No need to store caches in the cloud.
2021-03-06 21:58:23 +01:00
Michael Ball
bc4177154a
Add editing submission instructions
2021-03-06 12:45:00 -08:00
Henne Vogelsang
57360c183c
Merge pull request #2729 from hennevogel/bugfix/carrierwave-update
...
CarrierWave needs to be told where to store in 2.x
2021-03-06 21:44:33 +01:00
depfu[bot]
d534b42afa
Update dotenv-rails to version 2.7.6
2021-03-06 20:41:06 +00:00
Michael Ball
258a2c1489
Fix Frozen String Error in Commercials Controller
...
`errors_text` is a frozen string, so `<<` leads to an exception when trying to generate the error message.
https://sentry.cs10.org/share/issue/7867fdaf8eba4387ae2789fd5f1cff3b/
if you want a production example. :)
2021-03-06 21:40:25 +01:00
Henne Vogelsang
58d51c6d25
Merge pull request #2648 from AndrewKvalheim/webmock-webdrivers
...
Resolve conflict between WebMock and Webdrivers
2021-03-06 21:38:06 +01:00
Henne Vogelsang
8b0f6ae1f9
Merge pull request #2726 from openSUSE/depfu/update/rails-controller-testing-1.0.5
...
Update rails-controller-testing: 1.0.4 → 1.0.5 (patch)
2021-03-06 21:37:21 +01:00
Henne Vogelsang
e4c9100ea6
Merge pull request #2717 from hellcp/master
...
Add icalendar files
2021-03-06 21:36:50 +01:00
Henne Vogelsang
2c238365d6
CarrierWave needs to be told where to store in 2.x
2021-03-06 21:34:48 +01:00
depfu[bot]
dc02d0ce09
Update rails-controller-testing to version 1.0.5
2021-03-06 20:21:20 +00:00
Henne Vogelsang
30c2db682e
Merge pull request #2702 from AndrewKvalheim/omit-nil-smtp-settings
...
Allow leaving OSEM_SMTP_DOMAIN unset
2021-03-06 21:19:36 +01:00
Sasi Olin
613161bbc7
Add buttons in the interface
2021-03-06 21:18:42 +01:00
Sasi Olin
d540092bfc
Add icalendar files ( fixes #2147 )
2021-03-06 21:18:39 +01:00
Andrew Kvalheim
266fdbabea
Omit nil SMTP settings
...
Allows leaving `smtp_settings[:domain]` unspecified. Explicitly setting
it to `nil` (as when `OSEM_SMTP_DOMAIN` is unset) overrides the default
value of `'localhost.localdomain'` and caused SMTP connections to fail
with `EOFError`.
2021-03-06 21:10:36 +01:00
Henne Vogelsang
32164c47db
Merge pull request #2663 from AndrewKvalheim/docker-compose-v2.4
...
Update Docker Compose file format: 2.0 → 2.4 (minor)
2021-03-06 21:03:22 +01:00
