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

3588 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Kvalheim
04a77a6043 Merge #​2657 "Remove superfluous click to display Markdown editor" 2020-06-26 20:19:35 -07:00
Andrew Kvalheim
e4251d7b67 Merge #​2654 "Fix access to the version history of organization-level roles" 2020-06-26 20:19:34 -07:00
Andrew Kvalheim
668aa388a1 Merge #​2655 "Ignore schema.rb in RuboCop" 2020-06-26 20:19:34 -07:00
Andrew Kvalheim
042fe17fdb Merge #​2649 "Work around ChromeDriver/Chromium crash" 2020-06-26 20:19:33 -07:00
Andrew Kvalheim
09b30b4b23 Merge #​2648 "Resolve conflict between WebMock and Webdrivers" 2020-06-26 20:19:32 -07:00
Andrew Kvalheim
14fe81be29 Merge #​2647 "Install missing test dependency in base image" 2020-06-26 20:19:32 -07:00
Andrew Kvalheim
c5f937902a Merge #​2670 "Update all of rails: 5.2.3 → 5.2.4.3 (minor)" 2020-06-26 20:19:31 -07:00
Andrew Kvalheim
dd40243fbf Merge #​2646 "Use version range instead of OSEM_RUBY_VERSION." 2020-06-26 20:19:10 -07:00
Andrew Kvalheim
ace4fd4996 Merge #​2640 "Explicitly configure database authentication in Docker Compose" 2020-06-26 20:19:10 -07:00
depfu[bot]
7baf1099ab
Update all of rails to version 5.2.4.3 2020-06-20 02:40:59 +00: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
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
Andrew Kvalheim
e657d37c8d Whitelist Webdrivers update URLs in WebMock 
Resolves #2557:

    $ docker-compose run --rm osem bundle exec rspec --tag js
    …
    WebMock::NetConnectNotAllowedError

See titusfortner/webdrivers#109 for details.
 2020-04-12 17:43:46 -07: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
5b3520801f Use correct loading mode of Bootstrap-Markdown 
data-provide="markdown-editable" is intended for inline editing of page
content à la contenteditable. When this is applied to a textarea, the
editor is loaded only after the user clicks on the field. This behavior
breaks focus and is incompatible with keyboard navigation.
 2020-04-04 22:09:48 -07: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
17c0abb2de Don't clobber RuboCop's default excludes 
By default, adding an exclude (faffc49) has the effect of removing the
default excludes. Merge them as described in rubocop-hq/rubocop#6567.
 2020-04-03 17:06:36 -07:00
Andrew Kvalheim
faffc49020 Exclude Rails database schema from linting 
The schema is automatically generated, so RuboCop's recommendations are
non-actionable; ignore it as in rubocop-hq/rubocop#752.
 2020-04-03 16:39:23 -07:00
Andrew Kvalheim
fe2e5febe3 Deconflate organization/conference IDs in role versions 
Resolves failing test spec/features/versions_spec.rb:320.
 2020-04-03 16:19:36 -07:00
Andrew Kvalheim
79cd1c9fcd Grant permission to read, revert organization_admin version 
Without this permission, organization administrators can't see the
history of changes to the organization administrator role on the
Revision History screen.
 2020-04-03 15:35:58 -07:00
Andrew Kvalheim
71d9860124 Test access to organization_admin version as organization_admin 
This corrects the specification for the behavior of the Revision History
screen; changes to the organization administrator role should be
accessible to organization administrators, not conference organizers.
 2020-04-03 15:35:44 -07:00
Andrew Kvalheim
aa61ec9692 Remove unused code 2020-04-03 15:35:25 -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
f37eab88c7 Use Chrome::Options instead of Capabilities 
Resolves:

    $ docker-compose run --rm osem bundle exec rspec --tag js
    …
    Selenium::WebDriver::Error::UnknownError:
    unknown error: Chrome failed to start: exited abnormally.
 2020-03-28 13:30:45 -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
Andrew Kvalheim
8eb696bb4a Use version range instead of OSEM_RUBY_VERSION 2020-03-28 08:59:16 -07:00
depfu[bot]
0e3e832770
Update json to version 2.3.0 2020-03-19 15:49:52 +00:00
Andrew Kvalheim
38b6486550 Use database password in Docker Compose environment 
Addresses docker-library/postgres#681.
 2020-03-14 16:33:31 -07: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