Commit graph

3588 commits

Author SHA1 Message Date
Henne Vogelsang
be6464ff83
Switch to github actions
👋 travis, it was nice while it lasted! ❤️
2021-03-06 02:41:07 +01:00
Henne Vogelsang
a3721cb298
Merge pull request #2725 from hennevogel/bugfix/cleanup
Cleanup dev-env switch
2021-03-06 02:40:53 +01:00
Henne Vogelsang
2e706347a7
Pin the postgres container version 2021-03-06 02:39:19 +01:00
Henne Vogelsang
e16b4653c3
Adopt bundle to Gemfile changes 2021-03-06 02:39:19 +01:00
Henne Vogelsang
186ae74f7c
Merge pull request #2724 from hennevogel/feature/devenv-15-2
Switch dev-env to openSUSE 15.2
2021-03-06 00:22:31 +01:00
Henne Vogelsang
6648082968
Switch dev-env to openSUSE 15.2
...and to OBS built container images!
2021-03-06 00:08:35 +01:00
Henne Vogelsang
f08a09ae78
Merge pull request #2709 from openSUSE/depfu/update/nokogiri-1.11.1
🚨 [security] Update nokogiri: 1.10.10 → 1.11.1 (minor)
2021-03-05 16:59:45 +01:00
depfu[bot]
f97da69dcf
Update nokogiri to version 1.11.1 2021-01-11 04:47:00 +00:00
Hiroshi SHIBATA
ae98ac1430
Fixed some typos (#2695)
* Fix typos
2020-10-30 11:06:43 +02:00
Stella Rouzi
87144caeb3
Merge pull request #2691 from digitaltom/update_codecov_dependency
Update gems with security issues - make CI green
2020-10-29 09:40:17 +02:00
Stella Rouzi
e70cec6a5d
Merge pull request #2696 from differentreality/update_awesome_nested_set
Update gem awesome_nested_set
2020-10-29 08:58:33 +02:00
Thomas Schmidt
d097f1b29f
update awesome_nested_set 2020-10-28 23:32:32 +01:00
Stella Rouzi
dc4c4416e4 Update gem awesome_nested_set 2020-10-28 20:50:23 +02:00
Stella Rouzi
6956b2b48c
Merge pull request #2647 from AndrewKvalheim/chromium-dependencies
Install missing test dependency in base image
2020-10-28 18:11:29 +02:00
Stella Rouzi
90ef93cddd
Merge pull request #2673 from AndrewKvalheim/docker-production-assets
Serve precompiled assets in example Docker Compose configuration
2020-10-28 17:54:42 +02:00
Thomas Schmidt
588884bace
update jquery-ui-rails 2020-09-29 00:41:18 +02:00
Thomas Schmidt
7d0297410e
update chartkick dep 2020-09-29 00:29:14 +02:00
Thomas Schmidt
bfb036fa96
upgrade rails to 5.2.4.4 2020-09-29 00:15:42 +02:00
Thomas Schmidt
f5ac859b9b
The "chromeOptions" key in chrome capabilities changed to "goog:chromeOptions".
But I'm rather switching to the 'option' array here for readability and alignment with Firefox options.
2020-09-29 00:02:18 +02:00
Thomas Schmidt
046ed9f7b7
Update codecov dependency to latest 0.2.11
The used version 0.1.14 was yanked from rubygems.org
2020-09-28 22:58:24 +02:00
James Mason
6e6a6dcd39
Merge pull request #2679 from openSUSE/depfu/update/rack-2.1.4
🚨 [security] Update rack: 2.0.8 → 2.1.4 (minor)
2020-06-19 19:33:39 -07:00
depfu[bot]
3a3c0e6f2f
Update rack to version 2.1.4 2020-06-20 02:10:35 +00:00
James Mason
8c96a6cc9a
Merge pull request #2677 from openSUSE/depfu/update/websocket-extensions-0.1.5
🚨 [security] Update websocket-extensions: 0.1.4 → 0.1.5 (minor)
2020-06-19 19:09:34 -07:00
James Mason
0d876de27f
Merge pull request #2672 from openSUSE/depfu/update/puma-3.12.6
🚨 [security] Update puma: 3.12.4 → 3.12.6 (patch)
2020-06-19 19:09:13 -07:00
James Mason
754c47e41b
Merge pull request #2656 from AndrewKvalheim/ajax-datatables-rails-293-postgresql
Fix bug in UserDatatable query affecting PostgreSQL
2020-06-19 19:07:18 -07:00
depfu[bot]
acb3654af2
Update websocket-extensions to version 0.1.5 2020-06-05 18:44:31 +00:00
Andrew Kvalheim
b7187323a7 Serve precompiled assets in example Docker Compose configuration
Continues 959d5af.
2020-05-30 09:36:26 -07:00
depfu[bot]
4e6c74ecb5
Update puma to version 3.12.6 2020-05-22 20:50:27 +00:00
Stella Rouzi
a89201ff82
Merge pull request #2671 from ifellinaholeonce/master
Add uniqueness tests for Event scope on Vote model with User association
2020-05-21 08:47:26 +03:00
Tymm Schmitke
40036899b3 Add empty line at end of file 2020-05-19 23:18:05 -04:00
Tymm Schmitke
aa99f909a6 Add uniqueness tests for Event scope on Vote model with User association 2020-05-19 22:24:37 -04:00
James Mason
dfb159a0e1
Merge pull request #2638 from openSUSE/depfu/update/puma-3.12.4
🚨 [security] Update puma: 3.12.2 → 3.12.4 (patch)
2020-04-06 09:48:04 -07:00
James Mason
49639dadb1
Merge pull request #2637 from openSUSE/depfu/update/sqlite3-1.4.2
Update sqlite3: 1.4.1 → 1.4.2 (patch)
2020-04-06 09:46:41 -07:00
James Mason
8403074765
Merge pull request #2644 from openSUSE/depfu/update/json-2.3.0
🚨 [security] Update json: 2.2.0 → 2.3.0 (minor)
2020-04-06 09:46:08 -07:00
Stella Rouzi
303129bf45
Merge pull request #2652 from AndrewKvalheim/test-unspecified-order-2
Decouple tests from unspecified data ordering (part 2)
2020-04-06 15:26:07 +03:00
Andrew Kvalheim
4182b6fb8f Fix bug in UserDatatable query affecting PostgreSQL
Resolves:

    $ docker-compose run --rm osem bundle exec rspec ./spec/datatables/user_datatable_spec.rb:97
    …
    ActiveRecord::StatementInvalid:
    PG::GroupingError: ERROR:  column "users.id" must appear in the GROUP BY clause or be used in an aggregate function
2020-04-04 10:35:56 -07:00
Andrew Kvalheim
d3e73b103f Document workaround for jbox-web/ajax-datatables-rails#293 2020-04-04 10:35:44 -07:00
Andrew Kvalheim
a179a38fae Minor refactor 2020-04-01 08:53:46 -07:00
Andrew Kvalheim
10f0edac20 Decouple tests from unspecified data ordering
These tests have been passing with SQLite, but don't reflect guaranteed
behavior and with PostgreSQL failed intermittently.
2020-03-29 09:06:47 -07:00
Stella Rouzi
e709d080b4
Merge pull request #2650 from AndrewKvalheim/test-unspecified-order
Decouple tests from unspecified data ordering
2020-03-29 15:55:34 +03:00
Andrew Kvalheim
a7006a4edd Decouple tests from unspecified data ordering
These tests have been passing with SQLite, but don't reflect guaranteed
behavior and with PostgreSQL failed intermittently.
2020-03-28 15:15:01 -07:00
Andrew Kvalheim
d088a4ae17 Add missing Chromium dependencies in base image
Resolves:

    $ docker run --rm osem/base chromium --no-sandbox --headless
    … Check failed: InitDefaultFont(). Could not find the default font
2020-03-28 11:38:11 -07:00
depfu[bot]
0e3e832770
Update json to version 2.3.0 2020-03-19 15:49:52 +00:00
depfu[bot]
5c57ccdf5a
Update puma to version 3.12.4 2020-03-03 11:18:54 +00:00
depfu[bot]
8598652433
Update sqlite3 to version 1.4.2 2020-02-19 13:11:48 +00:00
Henne Vogelsang
e6f3aa559e
Merge pull request #2636 from openSUSE/depfu/update/nokogiri-1.10.8
🚨 [security] Update nokogiri: 1.10.5 → 1.10.8 (patch)
2020-02-19 14:07:45 +01:00
depfu[bot]
153b825923
Update nokogiri to version 1.10.8 2020-02-11 11:47:10 +00:00
Stella Rouzi
e38cfc55c4
Merge pull request #2586 from rahul2240/bug1
add condition for booth rejection mail
2020-01-07 00:34:38 +02:00
Stella Rouzi
3d74ba4742
Merge pull request #2619 from bennettscience/master
fixes redirect loop
2020-01-07 00:03:44 +02:00
Brian
2d31ababaa
Correct variable error
Line 30 was missing the `@` in `@event.speakers.any`, which caused a 500 error when clicking on a session in the program. Corrected the typo.
2019-12-20 10:38:14 -05:00