Commit graph

4058 commits

Author SHA1 Message Date
Andrew Kvalheim
ef298f5a22 Restore colors parameter of donut chart partial
This parameter was accidentally disconnected in commit c967a0b9a4
but is still used by `app/views/admin/conferences/index.html.haml` and
`app/views/admin/events/index.html.haml`.
2022-03-17 18:46:04 -07:00
Henne Vogelsang
ed8a2696bb
Merge pull request #2968 from AndrewKvalheim/unskip-tests
Re-enable skipped tests
2022-03-15 17:14:45 +01:00
Henne Vogelsang
83a6313496
Merge pull request #2967 from AndrewKvalheim/splashpage-versions-test
Restore test of splashpage revision history
2022-03-15 17:13:56 +01:00
Andrew Kvalheim
7e9ce60293 Partially revert "Skip some failing specs..."
This reverts the skipping of tests by commit b688d353ac in:

  - `spec/models/user_spec.rb`
  - `spec/controllers/admin/users_controller_spec.rb`
  - `spec/datatables/user_datatable_spec.rb`
2022-03-08 17:18:34 -08:00
Andrew Kvalheim
4b9eb440f4 Partially revert "Skip some failing specs..."
This reverts the changes to `spec/features/versions_spec.rb` made in
commit b688d353ac, except for the change
that was proposed in issue #2703.
2022-03-08 16:26:29 -08:00
Henne Vogelsang
af657ca77f
Merge pull request #2964 from AndrewKvalheim/splashpage-form-test
Update tests of splashpage forms
2022-03-08 13:24:08 +01:00
Henne Vogelsang
b04ad33138
Merge pull request #2963 from AndrewKvalheim/ajax-datatables-rails-1
Update UserDatatable for ajax-datatables-rails 1
2022-03-08 13:22:33 +01:00
Henne Vogelsang
5c7c75b53c
Merge pull request #2962 from AndrewKvalheim/countries-4.2
Update venue country name for Countries 4.2
2022-03-08 13:21:45 +01:00
Henne Vogelsang
9da3bf9337
Merge pull request #2965 from AndrewKvalheim/users-role-versions
Fix bug in which role assignments aren’t tracked in version history
2022-03-08 13:21:04 +01:00
Andrew Kvalheim
e2bc6fc1c7 Fix bug in which role assignments aren’t tracked in version history
Resolves failing test `spec/features/versions_spec.rb:344`:

    1) Version display changes in users_role for conference role
       Failure/Error: expect(page).to have_text("added role cfp with ID #{user_role.id} to user #{user.name} in conference #{conference.short_title}")
         expected to find text "added role cfp with ID 2 to user name2 in conference fr_GAQ" in "OSEM\nname1\nAll Conferences\nOrganizations\nRevision History\nAll Conferences\nRevision History\nLog of changes made to conferences and associated resources\nShow\n10\n25\n50\n100\nAll\nentries\nSearch:\nID Description Actions\n18\nname2 signed up less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n17\nSomeone (probably via the console) updated is admin of user name1 less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n16\nname1 signed up less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n15\nSomeone (probably via the console) created new cfp for events in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n14\nSomeone (probably via the console) created new role volunteers_coordinator in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n13\nSomeone (probably via the console) created new role info_desk in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n12\nSomeone (probably via the console) created new role cfp in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n11\nSomeone (probably via the console) created new role organizer in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n10\nSomeone (probably via the console) created new difficulty level Hard in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n9\nSomeone (probably via the console) created new difficulty level Medium in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\nShowing 1 to 10 of 16 entries\nFirst\nPrevious\n1\n2\nNext\nLast\nThis tool is free software, released under the MIT license. You can run, copy, distribute, study, change and improve it. The source code and the developers are on GitHub."
       # ./spec/features/versions_spec.rb:350:in `block (2 levels) in <top (required)>'
2022-03-06 23:38:42 -08:00
Andrew Kvalheim
4403f1149d Update tests of splashpage forms
The splashpage forms and default configuration changed in 81853d1ef9.
2022-03-06 23:28:58 -08:00
Andrew Kvalheim
83636afee0 Update UserDatatable for ajax-datatables-rails 1
Resolves failing test `spec/datatables/user_datatable_spec.rb:97`:

    1) UserDatatable outputs recordsTotal
       Failure/Error: filter_records(fetch_records).unscope(:group, :select).count(:all)

       NotImplementedError:
         NotImplementedError
       # ./app/datatables/user_datatable.rb:59:in `records_filtered_count'
       # ./spec/datatables/user_datatable_spec.rb:95:in `block (3 levels) in <top (required)>'
       # ./spec/datatables/user_datatable_spec.rb:98:in `block (3 levels) in <top (required)>'

Details: https://github.com/jbox-web/ajax-datatables-rails/blob/v1.3.1/doc/migrate.md#to-migrate-from-v04x-to-v100

RegistrationDatatable has already been updated in 81853d1ef9.
2022-03-06 23:12:02 -08:00
Andrew Kvalheim
a179609773 Update venue country name for Countries 4.2
Resolves:

    DEPRECATION WARNING: The Country#name method has been deprecated.
    Please use Country#iso_short_name instead or refer to the README
    file for more information on this change.

Details: https://github.com/countries/countries/blob/v4.2.2/README.markdown#upgrading-to-42-and-5x
2022-03-06 23:05:29 -08:00
Henne Vogelsang
a675399eb8
Merge pull request #2961 from hennevogel/feature/deploy-hot-restart
Use pumactl to "hot" restart
2022-03-03 17:55:57 +01:00
Henne Vogelsang
dffc5c1240
Updates puma to 5.6.2 (was 4.3.11)
Also use pumactl to "hot" restart
2022-03-03 17:45:58 +01:00
Henne Vogelsang
95964267a0
Merge pull request #2960 from hennevogel/bugfix/forms
Bugfix some forms
2022-03-03 17:01:20 +01:00
Henne Vogelsang
0ff503bc1b
Fix selectized users on booth/proposal forms 2022-03-03 16:48:49 +01:00
Henne Vogelsang
7e5175536e
Add missing container 2022-03-02 18:01:06 +01:00
Henne Vogelsang
7babc5d08a
Fix registration form
- Admins should be able to change admin status
- Username should not be changeable
- always require password confirmation
2022-03-02 17:59:30 +01:00
Henne Vogelsang
6304466696
Merge pull request #2959 from hennevogel/feature/deploy-bundler-config
Share bundler configuration between deploys
2022-03-02 15:34:51 +01:00
Henne Vogelsang
b9a3a6fb2b
Share bundler configuration between deploys 2022-03-02 15:15:32 +01:00
Henne Vogelsang
7047c0a70d
Merge pull request #2957 from openSUSE/depfu/update/image_processing-1.12.2
🚨 [security] Update image_processing: 1.12.1 → 1.12.2 (patch)
2022-03-02 12:51:22 +01:00
Henne Vogelsang
04352a6048
Merge pull request #2956 from openSUSE/depfu/update/cloudinary-1.22.0
Update cloudinary: 1.20.0 → 1.22.0 (minor)
2022-03-02 12:50:09 +01:00
depfu[bot]
d891a5f792
Update image_processing to version 1.12.2 2022-03-02 04:07:30 +00:00
depfu[bot]
b05e392f1e
Update cloudinary to version 1.22.0 2022-03-01 16:46:08 +00:00
Henne Vogelsang
b598028584
Merge pull request #2955 from openSUSE/depfu/update/stripe-5.44.0
Update stripe: 5.43.0 → 5.44.0 (minor)
2022-03-01 17:45:14 +01:00
depfu[bot]
e757650c4c
Update stripe to version 5.44.0 2022-03-01 16:25:46 +00:00
Henne Vogelsang
f9ab77db64
Merge pull request #2954 from openSUSE/depfu/update/simplecov_json_formatter-0.1.4
Update simplecov_json_formatter: 0.1.3 → 0.1.4 (minor)
2022-03-01 17:21:19 +01:00
Henne Vogelsang
b74730d76d
Merge pull request #2943 from hennevogel/bugfix/docker-shell-env
Fix docker shell environment
2022-03-01 15:50:43 +01:00
Henne Vogelsang
6f3111c35d
Fix docker shell environment
Move shared variables (nokogiri/path etc.) into the base image.

Fixes #2917
2022-03-01 15:43:23 +01:00
Henne Vogelsang
f5c8055c9f
Merge pull request #2953 from hennevogel/update/ruby-311
Update default ruby version to 3.1.1
2022-03-01 15:38:49 +01:00
depfu[bot]
b05a95331c
Update simplecov_json_formatter to version 0.1.4 2022-03-01 14:31:00 +00:00
Henne Vogelsang
bc649ad57f
Merge pull request #2952 from openSUSE/depfu/update/pg-1.3.2
Update pg: 1.2.3 → 1.3.2 (minor)
2022-03-01 15:28:45 +01:00
Henne Vogelsang
162c688a28
Update default ruby version to 3.1.1 2022-03-01 14:55:16 +01:00
depfu[bot]
5b2b5b6609
Update pg to version 1.3.2 2022-03-01 13:46:11 +00:00
Henne Vogelsang
4b0b251cf6
Merge pull request #2947 from openSUSE/depfu/update/rubocop-rails-2.13.2
Update rubocop-rails: 2.11.3 → 2.13.2 (minor)
2022-03-01 14:29:21 +01:00
Henne Vogelsang
697fa6f81c
Merge pull request #2948 from openSUSE/depfu/update/country_select-6.1.1
Update country_select: 6.0.0 → 6.1.1 (minor)
2022-03-01 14:28:59 +01:00
depfu[bot]
231e5281e1
Update country_select to version 6.1.1 2022-03-01 13:00:54 +00:00
Henne Vogelsang
d098ac7dea
Merge pull request #2946 from openSUSE/depfu/update/autoprefixer-rails-10.4.2.0
Update autoprefixer-rails: 10.3.1.0 → 10.4.2.0 (minor)
2022-03-01 14:00:04 +01:00
Henne Vogelsang
ff96b93b22
Merge pull request #2944 from openSUSE/depfu/update/parser-3.1.1.0
Update parser: 3.1.0.0 → 3.1.1.0 (patch)
2022-03-01 13:59:33 +01:00
Henne Vogelsang
68b3a7aa5a
Merge pull request #2945 from openSUSE/depfu/update/momentjs-rails-2.29.1.1
Update momentjs-rails: 2.20.1 → 2.29.1.1 (minor)
2022-03-01 13:57:35 +01:00
depfu[bot]
953e0c7a3c
Update rubocop-rails to version 2.13.2 2022-03-01 12:25:47 +00:00
depfu[bot]
d3d9ac256b
Update autoprefixer-rails to version 10.4.2.0 2022-03-01 12:21:18 +00:00
depfu[bot]
469fd9d985
Update momentjs-rails to version 2.29.1.1 2022-03-01 12:15:56 +00:00
depfu[bot]
e4fc6a25d8
Update parser to version 3.1.1.0 2022-03-01 12:11:12 +00:00
Henne Vogelsang
2a65ef0ba7
Merge pull request #2941 from openSUSE/depfu/update/diff-lcs-1.5.0
Update diff-lcs: 1.4.4 → 1.5.0 (minor)
2022-03-01 13:08:16 +01:00
Henne Vogelsang
a191f05c3b
Merge pull request #2940 from openSUSE/depfu/update/sprockets-rails-3.4.2
Update sprockets-rails: 3.2.2 → 3.4.2 (minor)
2022-03-01 13:07:53 +01:00
Henne Vogelsang
e6a8bcf28e
Merge pull request #2939 from openSUSE/depfu/update/mime-types-3.4.1
Update mime-types: 3.3.1 → 3.4.1 (minor)
2022-03-01 13:07:19 +01:00
depfu[bot]
0bec6ba0e1
Update diff-lcs to version 1.5.0 2022-02-25 14:26:07 +00:00
depfu[bot]
5dbde6c4ff
Update sprockets-rails to version 3.4.2 2022-02-25 14:21:58 +00:00