Commit graph

5100 commits

Author SHA1 Message Date
Benjamin Neff
022f367692
Fix some keyword args for ruby 3 compatibility 2022-07-21 01:25:53 +02:00
Benjamin Neff
111b3cdc8e
Upgrade diaspora_federation to 1.0 2022-07-20 23:06:18 +02:00
Benjamin Neff
d4079070ed
Merge branch 'next-minor' into develop 2022-07-20 21:34:39 +02:00
Benjamin Neff
3bb9b9a18d
Fix deprecation warnings for rails 6.1 2022-07-20 21:27:41 +02:00
Benjamin Neff
fe84d3e101
Upgrade to rails 6.1 2022-07-20 21:27:41 +02:00
Benjamin Neff
b5a46cf7bb
Fix deprecation warnings for rails 6.0 2022-07-20 21:26:58 +02:00
Benjamin Neff
2d38a24a86
Upgrade to rails 6.0 2022-07-20 21:26:58 +02:00
cmrd Senya
7b3ff37079 Replace textchange with native input event 2022-07-17 22:49:29 +03:00
Benjamin Neff
d0af34c079
Merge pull request #8358 from tclaus/supporting_heic_images
Using webp as storage format for images
2022-07-16 04:48:03 +02:00
Benjamin Neff
5669ba6b48
Merge branch 'next-minor' into develop 2022-07-16 04:44:59 +02:00
Benjamin Neff
a5e5c7f378
Fix Link to OWASP CSRF more information page
closes #8365
2022-07-16 04:44:17 +02:00
Benjamin Neff
dd3bc39c97
Render markdown to html for notifications 2022-07-16 04:34:07 +02:00
Benjamin Neff
3c02a1f067
Remove unused translation fallback 2022-07-16 04:22:51 +02:00
Benjamin Neff
a9ae84f3a6
Remove markerb dependency
markerb is dead and isn't compatible with rails 6 anymore. Removing it
means adding separate templates for text and html, this sadly means some
code duplication, but also luckily the templates aren't that
complicated, so the duplication is also very minimal.
2022-07-16 04:22:51 +02:00
Benjamin Neff
41633fcea9
Don't autoload PeopleHelper during initialization
this is for future rails versions with zeitwerk autoloader where this
isn't allowed anymore
2022-07-16 04:22:51 +02:00
Thorsten Claus
492ac74819 Issue #8355: Adding webp as supported file format
Converting all uploaded images to the webp format.
2022-07-01 13:50:01 +02:00
Benjamin Neff
1b2270572b
Merge branch 'next-minor' into develop 2022-06-29 13:28:02 +02:00
Benjamin Neff
739fc780c3
Manually stringify keys to fix sidekiq 7.0 deprecation warning
closes #8359
2022-06-29 13:27:37 +02:00
Benjamin Neff
add707252a
Merge branch 'next-minor' into develop
... and also remove json-schema-rspec dependency from api specs
2022-06-28 02:08:42 +02:00
Benjamin Neff
4076eb3fcf
Bump json-schema and remove json-schema-rspec (unmaintained) 2022-06-27 02:19:38 +02:00
Benjamin Neff
6c9e7f283f
Merge branch 'next-minor' into develop 2022-06-19 19:30:56 +02:00
Benjamin Neff
e5b65f6498
Fix jasmine fake publisher messing with follow up tests in random order 2022-06-19 19:29:50 +02:00
Sage Ross
cb774d1c50
Fix another order-dependent failure in router_spec.js 2022-06-19 17:24:41 +02:00
Sage Ross
692f5fdafb
Fix style violations, per automated code review 2022-06-19 17:24:40 +02:00
Sage Ross
37d440f91e
Turn on random spec order in jasmine.yml 2022-06-19 17:23:00 +02:00
Sage Ross
baeeee8e73
More order-dependent Jasmine test fixes 2022-06-19 17:23:00 +02:00
Sage Ross
23c2487550
Delete specs that cause order-dependent failures elsewhere
This set of specs — in particular, all the calls to `this.view.$el.find(...).trigger('click') — are changing the environment in ways that cause I18n missing key errors elsewhere.

There are failures in `app_spec.js` if this spec file is run before it, and I haven't found a way to reset the environment to avoid the issue.
2022-06-19 17:23:00 +02:00
Sage Ross
94956a2eda
Add workound for order-dependent notification_collection_spec.js
This is from Flaburgan: https://github.com/diaspora/diaspora/pull/8305/files

I can't find a better way around it. The specs that call `onChangedUnreadStatus` change the environment in ways we can't figure out how to reset cleanly.
2022-06-19 17:23:00 +02:00
Sage Ross
09ecaec0b5
Fix order-dependent Jasmine failure due to missing translation key
There must be another Jasmine spec that modifies the locale without loading the default afterwards.
2022-06-19 17:23:00 +02:00
Sage Ross
2b352b86ae
Fix order-dependent failures in comment_view_spec.js
It looks like these specs expect a logged-in user, and would fail when run after a test that logged out.
2022-06-19 17:23:00 +02:00
Sage Ross
1c577fb5b2
More fixes for order-dependent Jasmine spec failures
These ones would fail if `app.page` was in the wrong state from a previous test.
2022-06-19 17:23:00 +02:00
Sage Ross
b2ee986815
Fix order-dependent failure in app_spec.js
The 'sets the user' spec was failing if run after a spec that had already set the user.
2022-06-19 17:23:00 +02:00
Sage Ross
ae3bd1f62e
Fix order-dependent jasmine failure in contacts_collection_spec.js
This was failing if `app.aspect` got set by another spec than ran before it (such as one of the other specs in the same file, when run in a different order).
2022-06-19 17:22:59 +02:00
Sage Ross
b195861483
Fix order-dependent failures in notification_dropdown_view_spec.js
These tests were failing because of an error thrown from `this.header.render()`, unless `head_view_spec.js` had already been run to set app.notificationsCollection.
2022-06-19 17:22:59 +02:00
Sage Ross
4e4d332d6e
Fix more order-dependent jasmine specs 2022-06-19 17:22:59 +02:00
Sage Ross
56ef83fa8a
Don't overwrite app.stream properties in tests
These cases of modifying app.stream can cause other specs to fail, depending on test order. Here we either don't modify them if the tests still pass without manually stubbing `addNow`, or we cache and restore the properties we need to test.
2022-06-19 17:22:59 +02:00
Sage Ross
f4234fa3a0
Fix order-dependence bug in single_post_interactions_spec.js
This was only passing when run after a loginAs from another spec.
2022-06-19 17:22:59 +02:00
Sage Ross
f85135f726
Make shortcuts_spec.js more order-independent
This spec was failing whenever router_spec.js was not run prior it it running.
2022-06-19 17:22:59 +02:00
Sage Ross
0831d4e294
Fix order-dependent failure of stream_view_spec.js
This spec was only passing when it was run after another spec (router_spec.js) that put `app.page` in an appropriate state.
2022-06-19 17:22:53 +02:00
Dennis Schubert
22ac0872bd
Merge branch 'next-minor' into develop 2022-04-27 20:37:49 +02:00
Jonne Haß
43ee2dbb50 Do not allow to mass assign OTP fields on user edit page 2022-04-27 19:48:42 +02:00
Jonne Haß
1cfe0037f9 Do not allow the user to mass assign their own password alongside other
parameters

Much thanks to Breno Vitório (@brenu) for the report!
2022-04-27 13:44:48 +02:00
Benjamin Neff
36778dbeac
Remove /user/auth_token route, this was a leftover from the chat
Also remove authentication_token from database
2022-02-27 23:06:24 +01:00
Benjamin Neff
d3c2407df1
Don't overwrite photos of other users during import
If a photo with the same filename already exists, generate a new random
filename, and re-federate the photo with that filename. This ensures
users can't modify their archive to overwrite other users photos.
2021-11-24 02:42:31 +01:00
Benjamin Neff
e9f7bf382e
Send new remote_photo_path in migration message 2021-11-24 01:18:07 +01:00
Benjamin Neff
34528521f2
Allow to choose to overwrite settings and profile data 2021-11-23 01:48:33 +01:00
Benjamin Neff
96493b4a5c
Refactory archive concurrency so the same logic can be reused 2021-11-23 01:48:33 +01:00
Benjamin Neff
1eb2c59cce
Move extension logic to SecureUploader class 2021-11-23 01:48:32 +01:00
Thorsten Claus
6c4c6f8889
Migration Backend Part 2021-11-23 01:48:32 +01:00
Benjamin Neff
ced6905cbc
Merge pull request #8320 from tclaus/8319-fix_show_local_posts_link_in_ui
Show local posts in sidebar, if enabled
2021-11-23 01:42:01 +01:00