Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #324

Merged
merged 264 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
264 commits
Select commit Hold shift + click to select a range
1f31c1c
Correct invalid table markup
AndrewKvalheim Mar 4, 2023
2b77d51
Update rack to version 2.2.6.3
depfu[bot] Mar 7, 2023
4de554e
Merge pull request #3134 from openSUSE/depfu/update/rack-2.2.6.3
hennevogel Mar 8, 2023
1e97b39
Clarify to whom emails will be sent
AndrewKvalheim Mar 8, 2023
741c188
Move text out of Font Awesome icons
AndrewKvalheim Mar 10, 2023
e5ab9b4
Test select help text
AndrewKvalheim Mar 10, 2023
6ed1725
Server-side render initial visibility of select help text
AndrewKvalheim Mar 11, 2023
cdee712
Display track description on proposal form
AndrewKvalheim Mar 10, 2023
46e679c
Update cancancan to version 3.5.0
depfu[bot] Mar 12, 2023
1415ea2
Update rack to version 2.2.6.4
depfu[bot] Mar 15, 2023
22c1f07
Merge pull request #3142 from openSUSE/depfu/update/rack-2.2.6.4
hennevogel Mar 21, 2023
30c2432
Merge pull request #3128 from openSUSE/depfu/update/tilt-2.1.0
hennevogel Apr 4, 2023
4163062
Merge pull request #3141 from openSUSE/depfu/update/cancancan-3.5.0
hennevogel Apr 4, 2023
2ee1bec
Update rqrcode to version 2.1.2
depfu[bot] Apr 4, 2023
0b6a0e8
Update addressable to version 2.8.3
depfu[bot] Apr 8, 2023
22beddd
Update to latest ruby 3.1 version
hennevogel Apr 11, 2023
5174c2f
Merge pull request #3151 from hennevogel/update/ruby31
hennevogel Apr 11, 2023
ab81dd6
Stop pinning nokogiri for security updates...
hennevogel Apr 11, 2023
21ce273
Introduces lograge
hennevogel Apr 11, 2023
c6c78b9
Merge pull request #3152 from hennevogel/feature/lograge
hennevogel Apr 11, 2023
b1eedab
Update nokogiri to version 1.14.3
depfu[bot] Apr 11, 2023
22d7275
Merge pull request #3153 from openSUSE/depfu/update/nokogiri-1.14.3
hennevogel Apr 17, 2023
a00aad4
Merge pull request #3149 from openSUSE/depfu/update/addressable-2.8.3
hennevogel Apr 18, 2023
8971649
Merge pull request #3146 from openSUSE/depfu/update/rqrcode-2.1.2
hennevogel Apr 18, 2023
d20947a
Update omniauth-github to version 2.0.1
depfu[bot] Apr 18, 2023
d3fad47
Update delayed_job to version 4.1.11
depfu[bot] Apr 18, 2023
e6555e1
Merge pull request #3156 from openSUSE/depfu/update/omniauth-github-2…
hennevogel Apr 19, 2023
4af293c
Merge pull request #3157 from openSUSE/depfu/update/delayed_job-4.1.11
hennevogel Apr 19, 2023
af44d58
Merge pull request #3138 from AndrewKvalheim/track-help
hennevogel Apr 19, 2023
bebb1f3
Update skylight to version 5.3.4
depfu[bot] Apr 19, 2023
ddeb8bd
Merge pull request #3139 from AndrewKvalheim/font-awesome-spill
hennevogel Apr 19, 2023
4cb0147
Merge pull request #3135 from AndrewKvalheim/send-to-whom
hennevogel Apr 19, 2023
3aaf860
Merge pull request #3133 from AndrewKvalheim/thead-tr
hennevogel Apr 19, 2023
a276ba9
Update rails-i18n to version 7.0.6
depfu[bot] Apr 19, 2023
8b909a9
Merge pull request #3131 from AndrewKvalheim/nofollow
hennevogel Apr 19, 2023
86b8990
Merge pull request #3130 from AndrewKvalheim/vote-cache-expiration
hennevogel Apr 19, 2023
04b45ad
Merge pull request #3096 from AndrewKvalheim/api-urls
hennevogel Apr 19, 2023
ef88632
Merge pull request #3094 from differentreality/2738_history_changes_d…
hennevogel Apr 19, 2023
f533dd6
Merge pull request #3093 from differentreality/remove_datepicker_limits
hennevogel Apr 19, 2023
749115e
Merge pull request #3090 from AndrewKvalheim/api-time-zone
hennevogel Apr 19, 2023
83c9157
Merge pull request #3158 from openSUSE/depfu/update/skylight-5.3.4
hennevogel Apr 19, 2023
fd01351
Merge pull request #3159 from openSUSE/depfu/update/rails-i18n-7.0.6
hennevogel Apr 19, 2023
ab9afdf
Update jquery-rails to version 4.5.1
depfu[bot] Apr 19, 2023
64c8f89
Update carrierwave to version 2.2.3
depfu[bot] Apr 19, 2023
aa1ac22
Merge pull request #3160 from openSUSE/depfu/update/jquery-rails-4.5.1
hennevogel Apr 19, 2023
893eece
Merge pull request #3161 from openSUSE/depfu/update/carrierwave-2.2.3
hennevogel Apr 19, 2023
48ef3fa
Update digest to version 3.1.1
depfu[bot] Apr 19, 2023
ea808ed
Update json to version 2.6.3
depfu[bot] Apr 19, 2023
52abdc8
Merge pull request #3162 from openSUSE/depfu/update/digest-3.1.1
hennevogel Apr 19, 2023
3f77256
Update launchy to version 2.5.2
depfu[bot] Apr 19, 2023
274f215
Merge pull request #3163 from openSUSE/depfu/update/json-2.6.3
hennevogel Apr 19, 2023
1e85e52
Merge pull request #3164 from openSUSE/depfu/update/launchy-2.5.2
hennevogel Apr 19, 2023
a6040d4
Update dalli to version 3.2.4
depfu[bot] Apr 19, 2023
27f6aa5
Merge pull request #3166 from openSUSE/depfu/update/dalli-3.2.4
hennevogel Apr 19, 2023
6ed08cf
Update rolify to version 6.0.1
depfu[bot] Apr 19, 2023
128aeff
Update pg to version 1.4.6
depfu[bot] Apr 19, 2023
42b238c
Merge pull request #3165 from openSUSE/depfu/update/rolify-6.0.1
hennevogel Apr 20, 2023
f6e98e9
Merge pull request #3167 from openSUSE/depfu/update/pg-1.4.6
hennevogel Apr 20, 2023
44c70b1
Update autoprefixer-rails to version 10.4.13.0
depfu[bot] Apr 20, 2023
8d95203
Update database_cleaner to version 2.0.2
depfu[bot] Apr 20, 2023
6a0d3d2
Merge pull request #3168 from openSUSE/depfu/update/autoprefixer-rail…
hennevogel Apr 20, 2023
416e949
Merge pull request #3169 from openSUSE/depfu/update/database_cleaner-…
hennevogel Apr 20, 2023
54300b8
Update nio4r to version 2.5.9
depfu[bot] Apr 20, 2023
927cb54
Update icalendar to version 2.8.0
depfu[bot] Apr 20, 2023
e60b4c9
Merge pull request #3170 from openSUSE/depfu/update/nio4r-2.5.9
hennevogel Apr 21, 2023
4c2e146
Merge pull request #3171 from openSUSE/depfu/update/icalendar-2.8.0
hennevogel Apr 21, 2023
0cd4ac6
Update climate_control to version 1.2.0
depfu[bot] Apr 21, 2023
2cafa2b
Update dotenv to version 2.8.1
depfu[bot] Apr 21, 2023
755b678
Merge pull request #3172 from openSUSE/depfu/update/climate_control-1…
hennevogel Apr 21, 2023
03fda3a
Merge pull request #3173 from openSUSE/depfu/update/dotenv-2.8.1
hennevogel Apr 21, 2023
fce146d
Update webmock to version 3.18.1
depfu[bot] Apr 21, 2023
a34484c
Update haml-rails to version 2.1.0
depfu[bot] Apr 21, 2023
3f1723e
Merge pull request #3175 from openSUSE/depfu/update/webmock-3.18.1
hennevogel Apr 21, 2023
70a8daf
Merge pull request #3176 from openSUSE/depfu/update/haml-rails-2.1.0
hennevogel Apr 21, 2023
352fc2f
Update net-pop to version 0.1.2
depfu[bot] Apr 21, 2023
53968bc
Update webdrivers to version 5.2.0
depfu[bot] Apr 21, 2023
fb228f5
Merge pull request #3177 from openSUSE/depfu/update/net-pop-0.1.2
hennevogel Apr 21, 2023
2535f83
Merge pull request #3178 from openSUSE/depfu/update/webdrivers-5.2.0
hennevogel Apr 21, 2023
093993a
Update pdf-reader to version 2.11.0
depfu[bot] Apr 21, 2023
66948d5
Update rspec-support to version 3.12.0
depfu[bot] Apr 21, 2023
9ff9f0b
Merge pull request #3179 from openSUSE/depfu/update/pdf-reader-2.11.0
hennevogel Apr 24, 2023
2e7a36c
Merge pull request #3180 from openSUSE/depfu/update/rspec-support-3.12.0
hennevogel Apr 24, 2023
66dc15b
Update net-smtp to version 0.3.3
depfu[bot] Apr 24, 2023
3a6357b
Update timecop to version 0.9.6
depfu[bot] Apr 24, 2023
f0f409d
Merge pull request #3181 from openSUSE/depfu/update/net-smtp-0.3.3
hennevogel Apr 24, 2023
f99ff7f
Update iso-639 to version 0.3.6
depfu[bot] Apr 24, 2023
0b44d07
Merge pull request #3182 from openSUSE/depfu/update/timecop-0.9.6
hennevogel Apr 24, 2023
bddfebd
Merge pull request #3183 from openSUSE/depfu/update/iso-639-0.3.6
hennevogel Apr 24, 2023
e82501a
Update shoulda-matchers to version 5.3.0
depfu[bot] Apr 24, 2023
39109f9
Update ajax-datatables-rails to version 1.4.0
depfu[bot] Apr 24, 2023
4c9bc50
Merge pull request #3184 from openSUSE/depfu/update/shoulda-matchers-…
hennevogel Apr 24, 2023
0a043bc
Merge pull request #3185 from openSUSE/depfu/update/ajax-datatables-r…
hennevogel Apr 24, 2023
a225927
Update sprockets to version 4.2.0
depfu[bot] Apr 24, 2023
a12e0d5
Update unicode-display_width to version 2.4.2
depfu[bot] Apr 24, 2023
82d2ce6
Merge pull request #3187 from openSUSE/depfu/update/unicode-display_w…
hennevogel Apr 26, 2023
26af670
Merge pull request #3186 from openSUSE/depfu/update/sprockets-4.2.0
hennevogel Apr 26, 2023
9be9622
Update cloudinary to version 1.25.0
depfu[bot] Apr 26, 2023
fd31163
Update mysql2 to version 0.5.5
depfu[bot] Apr 26, 2023
3ce2308
Merge pull request #3188 from openSUSE/depfu/update/cloudinary-1.25.0
hennevogel Apr 26, 2023
e3139e7
Merge pull request #3189 from openSUSE/depfu/update/mysql2-0.5.5
hennevogel Apr 26, 2023
0cdd9ab
Update redcarpet to version 3.6.0
depfu[bot] Apr 26, 2023
7479824
Update acts_as_list to version 1.1.0
depfu[bot] Apr 26, 2023
88e6c18
Merge pull request #3190 from openSUSE/depfu/update/redcarpet-3.6.0
hennevogel Apr 27, 2023
94ec47d
Merge pull request #3191 from openSUSE/depfu/update/acts_as_list-1.1.0
hennevogel Apr 27, 2023
5cba90f
Update mail to version 2.8.1
depfu[bot] Apr 27, 2023
16eb13e
Update responders to version 3.1.0
depfu[bot] Apr 27, 2023
e734dbd
Update rubocop to version 1.50.2
depfu[bot] May 1, 2023
cce72a0
Merge OSEM master
cycomachead May 1, 2023
c185729
cleanup admin datatables HTML
cycomachead May 1, 2023
ada8d5a
Add missing form labels
AndrewKvalheim Mar 1, 2023
c403247
Restore detailed event form for admins
AndrewKvalheim Mar 1, 2023
694f397
Add test of admin editing a user
AndrewKvalheim Sep 12, 2022
9f72c5b
Add test of conference organizer adding a proposal
AndrewKvalheim Sep 12, 2022
3ae1275
Restore views for Admin::EventsController#new and Admin::UsersControl…
AndrewKvalheim Sep 14, 2022
fc507e8
Merge pull request #3129 from AndrewKvalheim/restore-views
hennevogel May 4, 2023
6da8dcc
Merge pull request #3193 from openSUSE/depfu/update/responders-3.1.0
hennevogel May 5, 2023
bf2d2c8
Merge pull request #3192 from openSUSE/depfu/update/mail-2.8.1
hennevogel May 5, 2023
8a5ab11
Update zeitwerk to version 2.6.8
depfu[bot] May 5, 2023
35d4af3
Update rails-assets-tinycolor to version 1.6.0
depfu[bot] May 5, 2023
91a9963
Merge branch 'main' into merge-upstream
cycomachead May 7, 2023
a862f86
regen lockfile
cycomachead May 7, 2023
b99a7ba
Merge pull request #3197 from openSUSE/depfu/update/zeitwerk-2.6.8
hennevogel May 8, 2023
0a2c283
Merge pull request #3198 from openSUSE/depfu/update/rails-assets-tiny…
hennevogel May 8, 2023
7e5dbeb
Update mini_portile2 to version 2.8.2
depfu[bot] May 8, 2023
7cf74f4
Merge pull request #3199 from openSUSE/depfu/update/mini_portile2-2.8.2
hennevogel May 8, 2023
60c0190
Update globalid to version 1.1.0
depfu[bot] May 8, 2023
8e4d8bd
Merge pull request #3201 from openSUSE/depfu/update/globalid-1.1.0
hennevogel May 8, 2023
9e36aa9
Regenerate rubocop TODO
hennevogel May 8, 2023
76145f0
Include rubocop-rails in configuration
hennevogel May 8, 2023
7b85b86
Introduces rubocop-capybara
hennevogel May 8, 2023
ff52f02
Introduces rubocop-performance
hennevogel May 8, 2023
0c322b2
Update rubocop TODO
hennevogel May 8, 2023
8831763
Merge pull request #3195 from openSUSE/depfu/update/rubocop-1.50.2
hennevogel May 8, 2023
e078460
Update sqlite3 to version 1.6.2
depfu[bot] May 8, 2023
f1efe98
Update font-awesome-sass to version 6.4.0
depfu[bot] May 8, 2023
d9f86d0
Drop country_select
depfu[bot] Apr 28, 2023
a154d99
Merge pull request #3194 from openSUSE/depfu/update/countries-5.4.0
hennevogel May 8, 2023
ad73522
Update devise to version 4.9.2
depfu[bot] May 8, 2023
9f59b8b
Merge pull request #3203 from openSUSE/depfu/update/sqlite3-1.6.2
hennevogel May 8, 2023
2b4ae30
Update capybara to version 3.39.0
depfu[bot] May 8, 2023
bd4b417
Update rubocop-rails to version 2.19.1
depfu[bot] May 8, 2023
05feb5f
Merge pull request #3196 from openSUSE/depfu/update/rubocop-rails-2.19.1
hennevogel May 8, 2023
7067870
Update recaptcha to version 5.13.0
depfu[bot] May 8, 2023
abaf51f
Update leaflet-rails to version 1.9.3
depfu[bot] May 8, 2023
ae8d5cd
Merge pull request #3205 from openSUSE/depfu/update/devise-4.9.2
hennevogel May 8, 2023
5b56202
Merge pull request #3206 from openSUSE/depfu/update/capybara-3.39.0
hennevogel May 8, 2023
e0cbf16
Merge pull request #3207 from openSUSE/depfu/update/recaptcha-5.13.0
hennevogel May 8, 2023
50abebf
Update all of sentry-ruby-core to version 5.9.0
depfu[bot] May 8, 2023
9197b3e
Merge pull request #3200 from openSUSE/depfu/update/leaflet-rails-1.9.3
hennevogel May 8, 2023
d691d16
Update rubocop-rspec to version 2.20.0
depfu[bot] May 8, 2023
c263bc4
Update next_rails to version 1.2.4
depfu[bot] May 8, 2023
9775fc4
Update caxlsx to version 3.4.1
depfu[bot] May 8, 2023
4ccf40f
Merge pull request #3208 from openSUSE/depfu/update/rubocop-rspec-2.20.0
hennevogel May 8, 2023
a16b1b7
Merge pull request #3209 from openSUSE/depfu/update/group/sentry-ruby…
hennevogel May 8, 2023
f033500
Merge pull request #3210 from openSUSE/depfu/update/next_rails-1.2.4
hennevogel May 8, 2023
6c53877
Update pg to version 1.5.3
depfu[bot] May 8, 2023
b0d2604
Merge pull request #3204 from openSUSE/depfu/update/font-awesome-sass…
hennevogel May 8, 2023
7e7a7ab
Merge pull request #3211 from openSUSE/depfu/update/caxlsx-3.4.1
hennevogel May 8, 2023
b0c4e46
Merge pull request #3212 from openSUSE/depfu/update/pg-1.5.3
hennevogel May 8, 2023
519f38f
Update haml to version 6.1.1
depfu[bot] May 8, 2023
f86149e
Update simplecov to version 0.22.0
depfu[bot] May 8, 2023
3207c20
Update chartkick to version 5.0.2
depfu[bot] May 10, 2023
8be57f1
Merge pull request #3214 from openSUSE/depfu/update/haml-6.1.1
hennevogel May 12, 2023
fdb0b4f
Merge pull request #3215 from openSUSE/depfu/update/simplecov-0.22.0
hennevogel May 12, 2023
f92627a
Merge pull request #3218 from openSUSE/depfu/update/chartkick-5.0.2
hennevogel May 12, 2023
a14b7c4
Update rspec-rails to version 6.0.2
depfu[bot] May 12, 2023
c792ab1
Update recaptcha to version 5.14.0
depfu[bot] May 12, 2023
2619448
Update web-console to version 4.2.0
depfu[bot] May 12, 2023
a280307
Update faker to version 3.2.0
depfu[bot] May 12, 2023
f40fdf2
Merge pull request #3219 from openSUSE/depfu/update/rspec-rails-6.0.2
hennevogel May 17, 2023
88d1865
Merge pull request #3220 from openSUSE/depfu/update/recaptcha-5.14.0
hennevogel May 17, 2023
56e9660
Merge pull request #3221 from openSUSE/depfu/update/web-console-4.2.0
hennevogel May 17, 2023
4484bdf
Merge pull request #3222 from openSUSE/depfu/update/faker-3.2.0
hennevogel May 17, 2023
5aab8be
Update puma to version 6.2.2
depfu[bot] May 17, 2023
a00f0a4
Update json-schema to version 4.0.0
depfu[bot] May 17, 2023
905f786
Merge pull request #3225 from openSUSE/depfu/update/puma-6.2.2
hennevogel May 17, 2023
25eedbc
Merge pull request #3226 from openSUSE/depfu/update/json-schema-4.0.0
hennevogel May 17, 2023
fdc979b
Update acts_as_commentable_with_threading to version 2.0.1
depfu[bot] May 17, 2023
e02c6aa
Update daemons to version 1.4.1
depfu[bot] May 17, 2023
6d71104
Update temple to version 0.10.1
depfu[bot] May 17, 2023
916a32b
Update nokogiri to version 1.15.0
depfu[bot] May 17, 2023
43c4948
Update loofah to version 2.21.3
depfu[bot] May 17, 2023
78089f1
Update rails-i18n to version 7.0.7
depfu[bot] May 17, 2023
738bc5f
Update capybara to version 3.39.1
depfu[bot] May 17, 2023
912f0f2
Update rubocop to version 1.51.0
depfu[bot] May 17, 2023
333671b
Merge pull request #3228 from openSUSE/depfu/update/acts_as_commentab…
hennevogel May 17, 2023
6f52a5d
Merge pull request #3229 from openSUSE/depfu/update/daemons-1.4.1
hennevogel May 17, 2023
50b8568
Merge pull request #3231 from openSUSE/depfu/update/temple-0.10.1
hennevogel May 17, 2023
e2700ae
Merge pull request #3232 from openSUSE/depfu/update/nokogiri-1.15.0
hennevogel May 17, 2023
b357f05
Merge pull request #3233 from openSUSE/depfu/update/loofah-2.21.3
hennevogel May 17, 2023
6ce7f21
Merge pull request #3234 from openSUSE/depfu/update/rails-i18n-7.0.7
hennevogel May 17, 2023
f6d379b
Merge pull request #3235 from openSUSE/depfu/update/capybara-3.39.1
hennevogel May 17, 2023
da32415
Merge pull request #3236 from openSUSE/depfu/update/rubocop-1.51.0
hennevogel May 17, 2023
234762f
Update sqlite3 to version 1.6.3
depfu[bot] May 24, 2023
b2cd004
Update rqrcode to version 2.2.0
depfu[bot] May 24, 2023
fee8d41
Merge pull request #3239 from openSUSE/depfu/update/sqlite3-1.6.3
hennevogel May 26, 2023
bd93753
Merge pull request #3240 from openSUSE/depfu/update/rqrcode-2.2.0
hennevogel May 26, 2023
31ffa10
Allow runtime configuration of Sentry tracing sample rate
AndrewKvalheim Jun 9, 2023
1a4c813
Merge pull request #3245 from AndrewKvalheim/sentry_traces_sample_rate
hennevogel Jun 21, 2023
ed774a8
Update selenium-webdriver to version 4.10.0
depfu[bot] Jun 29, 2023
1c3e76e
Update capybara to version 3.39.2
depfu[bot] Jun 29, 2023
8026a80
Update carrierwave to version 2.2.4
depfu[bot] Jun 29, 2023
7750ed6
Merge pull request #3248 from openSUSE/depfu/update/carrierwave-2.2.4
hennevogel Jul 5, 2023
2913f8e
Merge pull request #3247 from openSUSE/depfu/update/capybara-3.39.2
hennevogel Jul 5, 2023
8d7ae32
Merge pull request #3246 from openSUSE/depfu/update/selenium-webdrive…
hennevogel Jul 5, 2023
920a2c2
Update webdrivers to version 5.3.1
depfu[bot] Aug 11, 2023
0261e86
Merge pull request #3251 from openSUSE/depfu/update/webdrivers-5.3.1
hennevogel Aug 11, 2023
78ccabb
Update jwt to version 2.7.1
depfu[bot] Aug 11, 2023
5e18261
Update dalli to version 3.2.5
depfu[bot] Aug 11, 2023
0a58249
Update fastimage to version 2.2.7
depfu[bot] Aug 11, 2023
68555cf
Merge pull request #3255 from openSUSE/depfu/update/jwt-2.7.1
hennevogel Aug 14, 2023
be89857
Merge pull request #3253 from openSUSE/depfu/update/dalli-3.2.5
hennevogel Aug 15, 2023
b39ad61
Merge pull request #3254 from openSUSE/depfu/update/fastimage-2.2.7
hennevogel Aug 15, 2023
28e5575
Merge branch 'main' into merge-upstream
cycomachead Feb 13, 2024
df692ce
Merge osem upstream
cycomachead Feb 13, 2024
b5e95bf
Rerun bundle install
cycomachead Feb 13, 2024
ef19e88
Fix venue after dropping country_select
cycomachead Feb 13, 2024
b69fe0c
Fix nodejs version
cycomachead Feb 13, 2024
da9c8fb
Delint factorybot issues in specs
cycomachead Feb 13, 2024
f4e3ca2
Resolve the rest of the rubocop config issues
cycomachead Feb 13, 2024
1dc8169
Run rubocop -a with current config
cycomachead Feb 13, 2024
c1a7c58
Regen rubocop_todo
cycomachead Feb 13, 2024
4719ec6
Add lockfile platform for ci
cycomachead Feb 13, 2024
3b26f28
Remove skylight gem
cycomachead Feb 13, 2024
21fcd44
Remove the jemalloc gem.
cycomachead Feb 13, 2024
40cf2a8
merge main, resolve lockfile
cycomachead Feb 13, 2024
553157b
Update loofah gem for CI
cycomachead Feb 13, 2024
b45c25d
Once again add platform to lockfile
cycomachead Feb 13, 2024
9e69cfc
Update sprockets for CI...
cycomachead Feb 13, 2024
1789f04
Update rubocop and rerun rubocop -a
cycomachead Feb 13, 2024
0e76079
Regen rubocop_top using bundle exec rubocop
cycomachead Feb 13, 2024
460acc8
Resolve factory_bot error
cycomachead Feb 13, 2024
ad9b8da
Resolve model specs with coercion fix
cycomachead Feb 13, 2024
30b03c4
Remove old ruby: block from proposals haml
cycomachead Feb 13, 2024
27ffec4
Tidy up proposals haml
cycomachead Feb 13, 2024
2e08b63
Delint with rubocop
cycomachead Feb 13, 2024
975188c
Cleanup country partial
cycomachead Feb 13, 2024
3dba044
Upstream merge - restore 'materials' text instead of commericals
cycomachead Feb 13, 2024
7863936
Merge: Resolve to bad merge conflict comments
cycomachead Feb 13, 2024
c643872
Rails config - tidy variables
cycomachead Feb 13, 2024
c80572f
Revert "Rails config - tidy variables"
cycomachead Feb 13, 2024
917b096
Cleanup markdown sanitization
cycomachead Feb 13, 2024
30cd880
try fixing cuke redirect error
cycomachead Feb 13, 2024
2e7b4a2
minor format helper refactoring for rubocop
cycomachead Feb 13, 2024
a2826a3
Resolve some local webmock chrome annoyances
cycomachead Feb 13, 2024
5a914a5
Cleanup specs around events_per_page
cycomachead Feb 13, 2024
c4ded77
merge master
cycomachead Feb 13, 2024
b839bba
bundle update puma
cycomachead Feb 13, 2024
c0b5a0b
Tidy up all specs for proposals
cycomachead Feb 13, 2024
27ad42d
Delint
cycomachead Feb 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '16.x'
- run: sudo apt-get install xvfb
- name: Install JavaScript libraries via npm
run: npm install
Expand Down
8 changes: 5 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
inherit_from: .rubocop_todo.yml

require:
- rubocop-rspec
- rubocop-rails # Currently disabled below.
- rubocop-rails
- rubocop-capybara
- rubocop-performance

inherit_from: .rubocop_todo.yml

inherit_mode:
merge:
Expand Down
Loading
Loading