Commit graph

17547 commits

Author SHA1 Message Date
Terry Garcia
81aac88f65 [Glitch] Switched bookmark and favourites around
Port f5fe444913 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05 21:07:55 +01:00
Claire
05763031f1 [Glitch] Fix duplicate “Publish” button on mobile
Port 3faa229d8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05 21:07:10 +01:00
Claire
a6363c3a2a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
2023-03-05 20:46:56 +01:00
Claire
f7a679a4f5 New Crowdin updates (#2118)
* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]
2023-03-05 20:38:18 +01:00
Claire
1103612c66 Merge pull request #2121 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-03-05 20:37:42 +01:00
Christian Schmidt
b50a08b15b [Glitch] Add lang attribute to media and poll options
Port 41655e16ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05 17:52:53 +01:00
Eugen Rochko
59491ba42b Fix pgBouncer resetting application name on every transaction (#23958) 2023-03-05 01:52:42 +01:00
Eugen Rochko
8f9f5dd620 Fix streaming API not being usable without DATABASE_URL (#23960) 2023-03-05 01:52:12 +01:00
Samruddhi Khandale
2bc18f4438 Updates dev container and adds doc for getting started with GitHub Codespaces (#23872) 2023-03-05 00:35:00 +01:00
Nick Schonning
f731ba595b Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00
Matt Jankowski
25aed1dafa Update browser gem to version 5.3.1 (#23945) 2023-03-05 00:33:08 +01:00
Christian Schmidt
50b76430b4 Do not leave Mastodon when clicking “Back” (#23953) 2023-03-04 23:18:19 +01:00
Matt Jankowski
f6f3004420 Fix spec for api/v1/statuses/translations (#23956) 2023-03-04 23:17:46 +01:00
Matt Jankowski
d1984eb87f Restore missing fabricators (#23951) 2023-03-04 18:31:13 +01:00
Matt Jankowski
db41d60d04 Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +01:00
Matt Jankowski
471346fd3a User mailer spec coverage improvements (#23905) 2023-03-04 17:16:11 +01:00
Matt Jankowski
6e2d11ff48 Admin controllers specs (#23917) 2023-03-04 17:13:28 +01:00
Matt Jankowski
9a16204737 Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
Matt Jankowski
5676537303 Fabricator specs (#23925) 2023-03-04 17:12:09 +01:00
Matt Jankowski
c48dd42fa8 Misc coverage improvements for validators (#23928) 2023-03-04 17:00:00 +01:00
Matt Jankowski
6210055dde Helpers specs coverage improvement (#23937) 2023-03-04 16:58:11 +01:00
Matt Jankowski
5149123d20 Policies specs (#23924) 2023-03-04 16:57:22 +01:00
Matt Jankowski
5b612db821 Settings controllers specs (#23915) 2023-03-04 16:56:43 +01:00
Matt Jankowski
9e213fd37d Add basic coverage for some worker jobs (#23943) 2023-03-04 16:56:09 +01:00
Matt Jankowski
bf674337d9 Models specs coverage (#23940) 2023-03-04 16:43:47 +01:00
Jean byroot Boussier
08c2938b4a Upgrade to latest redis-rb 4.x and fix deprecations (#23616)
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-04 16:38:28 +01:00
Claire
370cff9a5d Disable Style/SymbolArray (#23921) 2023-03-03 22:55:43 +01:00
Nick Schonning
5f8438c42c Remove pry gems (#23884) 2023-03-03 22:53:08 +01:00
Nick Schonning
24b0410744 Remove implied StandardError rescue (#23942) 2023-03-03 22:49:16 +01:00
Nick Schonning
03e192ae38 Remove climate_control gem (#23886) 2023-03-03 22:48:48 +01:00
Claire
fe098d35c2 Fix original account being unfollowed on migration before the follow request could be sent (#21957) 2023-03-03 21:13:55 +01:00
Claire
8f79c53cd6 Change ActivityPub::DeliveryWorker retries to be spread out more (#21956) 2023-03-03 21:08:22 +01:00
Christian Schmidt
cc0c37cd69 Only offer translation for supported languages (#23879) 2023-03-03 21:06:31 +01:00
Ramūns Usovs
c92301e942 Allow streaming to connect to postgress with self-signed certs (#21431) 2023-03-03 21:01:18 +01:00
Jamie Hoyle
8f81dba434 Added support for specifying S3 storage classes in environment (#22480) 2023-03-03 20:53:37 +01:00
Claire
f1c31853e3 Add tests for moderation actions without custom text (#23184) 2023-03-03 20:50:46 +01:00
Claire
5acc02793a Fix external authentication not running onboarding code for new users (#23458) 2023-03-03 20:45:55 +01:00
Claire
cdc026c2fb Fix tootctl accounts migrate error due to typo (#23567) 2023-03-03 20:45:12 +01:00
Claire
db0bbe5cb7 Add mail headers to avoid auto-replies (#23597) 2023-03-03 20:44:46 +01:00
Claire
05ef604007 Fix error when displaying post history of a trendable post in the admin interface (#23574) 2023-03-03 20:44:02 +01:00
Terry Garcia
f5fe444913 Switched bookmark and favourites around (#23701) 2023-03-03 20:37:49 +01:00
Claire
30c34fe90f Change unintended SMTP read timeout from 5 seconds to 20 seconds (#23750) 2023-03-03 20:37:22 +01:00
Claire
6943192f5e Fix server error when failing to follow back followers from /relationships (#23787) 2023-03-03 20:36:18 +01:00
Claire
3faa229d8d Fix duplicate “Publish” button on mobile (#23804) 2023-03-03 20:25:36 +01:00
Claire
7bc43c91a0 Fix “Remove all followers from the selected domains” being more destructive than it claims (#23805) 2023-03-03 20:25:15 +01:00
Claire
16c8144b1c Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
Claire
a95dc48e01 Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
Matt Jankowski
35cbd0685d Fix deprecation warning about merging conditions (#23618) 2023-03-02 16:21:04 +01:00
Matt Jankowski
0d409f9fd7 Update rspec-rails to version 6.0.1 (#23908) 2023-03-02 15:55:37 +01:00
Matt Jankowski
0fe721074b Add spec coverage for Admin::Trends::StatusesHelper (#23898) 2023-03-02 15:30:40 +01:00