Commit graph

3882 commits

Author SHA1 Message Date
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
Michael Ball
744fe48121
Merge pull request #39 from snap-cloud/more-fixes
More fixes
2020-06-24 03:12:47 -07:00
Michael Ball
46955e4ed9 Up max speakers to 100 2020-06-24 02:55:20 -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
Michael Ball
dbfebdcd01 Ooops. Fix indentation 2020-06-18 12:08:15 -07:00
Michael Ball
05fa9e8d3d set @user correctly 2020-06-18 12:02:59 -07:00
Michael Ball
3432b9fd9e ugh, typo 2020-06-18 11:50:34 -07:00
Michael Ball
68e574dd9e Add in registration warning 2020-06-18 11:37:26 -07:00
Michael Ball
38e3cc12fd strip text on homepage tickets 2020-06-18 11:04:11 -07:00
Michael Ball
1d478ba5b9 Fix split by newlines 2020-06-18 11:03:20 -07:00
Michael Ball
f9a3bd73a2 Add fallback oembeds 2020-06-18 11:01:39 -07:00
Michael Ball
26692027a5 Restore registration flow 2020-06-18 04:29:57 -07:00
Michael Ball
545b4b8852 Fix letter opener; tweak ticket display 2020-06-18 04:14:38 -07:00
Michael Ball
a5c10dc161 ugh typo 2020-06-15 10:55:26 -07:00
Michael Ball
77571b940b HACK!!! Return 0 so the method works. 2020-06-15 04:34:11 -07:00
Michael Ball
e8ab2e1b29 attempt to fix a bad bug?? 2020-06-15 04:32:53 -07:00
Michael Ball
985d2ca248 Update logo again 2020-06-09 18:59:41 -07:00
Michael Ball
9cc2c103bc update snapcon logo 2020-06-09 18:20:21 -07:00
Michael Ball
a3a7f54847 Fix link_to call in tickets view 2020-06-09 03:31:55 -07:00
Michael Ball
d5cd328536 fix missing @ in @conference tickets view 2020-06-09 03:27:46 -07:00
Michael Ball
19ac2f8ea1 Do not allow registrations without tickets 2020-06-09 03:19:41 -07:00
Michael Ball
907cd182a0 Add purchase date to admin tickets 2020-06-09 02:51:05 -07:00
depfu[bot]
acb3654af2
Update websocket-extensions to version 0.1.5 2020-06-05 18:44:31 +00:00
Michael Ball
ce3f9e422a Tidy up some text around logins and proposals 2020-06-04 02:04:07 -07:00
Michael Ball
7d8245fa68
Merge pull request #36 from snap-cloud/michael/rm-start-restriction
DatePickers: Remove enforcing start date min.
2020-06-02 02:40:06 -07:00
Michael Ball
8d5c300639
Merge branch 'master' into michael/rm-start-restriction 2020-06-02 02:08:33 -07:00
Michael Ball
152f200f93 DatePickers: Remove enforcing start date min.
You might want to edit conference metadata after the start date has past, so it is
logical to allow the start date to be earlier than "today". As there are no backend
validations, this change is safe and removes a UI bug.
2020-06-02 02:04:38 -07:00
Michael Ball
0b9b100bf3 Merge master 2020-06-02 01:59:54 -07: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
Andrew Kvalheim
16b7d6f69d Work around bug in migrations to non-null columns
When running migration 20170705075039 followed by 20170715131706, the
latter fails due to lingering null values in a newly non-null column—

    Mysql2::Error: Invalid use of NULL value: ALTER TABLE `tracks` CHANGE `state` `state` varchar(255) DEFAULT 'new' NOT NULL
    db/migrate/20170715131706_make_track_state_not_null_and_add_default_value.rb:17:in `change'

—despite having apparently converted any existing null values prior to
changing the column type. Investigation reveals that actually the
attempted conversion has had no effect, and that this can be resolved by
clearing ActiveRecord internal caches between migrations:

    connection.schema_cache.clear_data_source_cache! 'tracks'

The same problem also affects running 20170705075039 followed by
20170720134353, but in that case it leads to silent data corruption as
`change_column_null` automatically converts any lingering null values.

This commit 1) clears ActiveRecord internal caches at the beginning of
each affected migration, and 2) replaces `change_column_null` with
`change_column` to reflect that no automatic conversion is intended.
2020-05-12 08:18:12 -07:00
Andrew Kvalheim
63aa240e65 Fix migration that fails on conferences without pictures
CarrierWave documentation:

> Note: `recreate_versions!` will throw an exception on records without
> an image. To avoid this, scope the records to those with images or
> check if an image exists within the block.

Resolves #1976:

    NoMethodError: undefined method `read' for nil:NilClass
    …/carrierwave-1.3.1/lib/carrierwave/uploader/cache.rb:81:in `sanitized_file'
    …/carrierwave-1.3.1/lib/carrierwave/uploader/cache.rb:118:in `cache!'
    …/carrierwave-1.3.1/lib/carrierwave/uploader/versions.rb:234:in `recreate_versions!'
    db/migrate/20171130172334_rebuild_conference_pictures.rb:4:in `block in up'
2020-05-12 07:43:58 -07:00
Andrew Kvalheim
4a0961e88e Annotate past migrations with Rails version
Many migrations currently fail to run with:

> Directly inheriting from ActiveRecord::Migration is not supported.
> Please specify the Rails release the migration was written for:
>
>     class Example < ActiveRecord::Migration[4.2]

I've annotated those that I need to run with the Rails version at the
time each was committed:

    rake db:migrate:status \
    | grep --perl-regexp --only-matching '(?<=^  down    )\d{14}' \
    | while read -r id; do
      path="$(ls -1 db/migrate/${id}_*.rb)"
      version="$(git show "$(git log --diff-filter=A --pretty=format:%H -- "$path")":Gemfile.lock \
        | grep --perl-regexp --only-matching '(?<=^    rails \()\d+\.\d+(?=(\.\d+)+\))')"
      sed --in-place -e "s/\(< ActiveRecord::Migration\)$/\\1[$version]/" "$path"
    done
2020-05-12 07:09:28 -07:00
Andrew Kvalheim
c34b55c1b8 Update Docker Compose file format: 2.0 → 2.4 (minor)
Allows the use of additional parameters such as `cpus` and
`healthcheck`.
2020-04-13 08:45:31 -07: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
Andrew Kvalheim
e077fe9671 Fix bug in test of animated form
The help text for the event type field is animated using a technique
unaffected by `Capybara.disable_animation`. Wait for the animation.

Resolves: #2356
Works around: #2661
2020-04-12 13:40:49 -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