treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
18,829 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

18829 Commits (9d885a93fc5e2c33c19d79151fb964ea941164b1)

Author SHA1 Message Date
Claire 7bf852b3f5 Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-17 18:58:40 +02:00
Matt Jankowski 4bbb68d888 Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947) 2023-07-17 18:18:13 +02:00
Claire 80fa2baa3d Fix “Back” button sometimes redirecting out of Mastodon (#25281) 2023-07-17 17:32:46 +02:00
Matt Jankowski 65d52af3e7 Fix haml-lint Rubocop `Style/StringLiterals` cop (#25948) 2023-07-17 16:57:18 +02:00
Daniel M Brasil 381baa978a Migrate to request specs in `/api/v1/statuses/:status_id/favourite` (#25626) 2023-07-17 16:53:57 +02:00
Daniel M Brasil b9694cb13e Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` (#25624) 2023-07-17 16:51:49 +02:00
Daniel M Brasil 31b2765f6e Migrate to request specs in `/api/v1/polls` (#25596) 2023-07-17 16:50:00 +02:00
Daniel M Brasil 32b7709183 Migrate to request specs in `/api/v1/statuses/:status_id/pin` (#25635) 2023-07-17 16:24:05 +02:00
Daniel M Brasil 07cb4e35f4 Migrate to request specs in `/api/v1/emails/confirmations` (#25686) 2023-07-17 16:22:33 +02:00
Daniel M Brasil 9c6f214c17 Migrate to request specs in `/api/v1/timelines/home` (#25743) 2023-07-17 16:20:11 +02:00
Nick Schonning 020101b0a8 Increase PR Rebase job retries (#25926) 2023-07-17 16:10:43 +02:00
Jeong Arm 90a68ac5b5 Check if json body is null on Activitipub::ProcessingWorker (#26021) 2023-07-17 15:51:30 +02:00
Matt Jankowski a522b40507 Fix haml-lint Rubocop `Style/MinMaxComparison` cop (#25974) 2023-07-17 15:38:04 +02:00
Matt Jankowski af05a88ea8 Fix haml-lint Rubocop `lambda` cop (#25946) 2023-07-17 15:07:29 +02:00
Matt Jankowski 84c5baf149 Fix haml lint Rubocop `Style/RedundantStringCoercion` cop (#25975) 2023-07-17 14:08:56 +02:00
renovate[bot] 877ea733b2 Update dependency react-select to v5.7.4 (#26033) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 14:07:36 +02:00
Claire e8631f8e90 Remove unfollowed hashtag posts from home feed (#26028) 2023-07-17 13:56:28 +02:00
Claire 2d1ecbe1fe Fix some incorrect tests (#26035) 2023-07-17 13:13:43 +02:00
Michael Stanclift df2d18c52a [Glitch] Fix for "follows you" indicator in light web UI not readable 
Port 40e20d687a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-17 13:01:47 +02:00
Terence Eden d2500a89fc [Glitch] Prevent split line between icon and number on reposts & favourites 
Port 82b0cfce7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-17 13:01:07 +02:00
Claire 0ef1efbe71 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
renovate[bot] d35725d9b5 Update dependency public_suffix to v5.0.3 (#26032) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 12:40:54 +02:00
Nick Schonning 6d256a116c Update rubocop 1.54.2 (#26002) 2023-07-17 12:40:27 +02:00
renovate[bot] fb18574f9c Update dependency aws-sdk-s3 to v1.130.0 (#25967) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 12:39:50 +02:00
fusagiko / takayamaki 94a411d276 remove some file paths from rubocop_tobo.yml (#26022) 2023-07-17 12:15:32 +02:00
renovate[bot] 42f670c82d Update dependency postcss to v8.4.26 (#26030) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 12:13:01 +02:00
Claire a75c14ffc0 Fix ArgumentError in mailers when a user's timezone is blank (#26025) 2023-07-17 12:10:50 +02:00
Michael Stanclift 40e20d687a Fix for "follows you" indicator in light web UI not readable (#25993) 2023-07-17 11:51:00 +02:00
renovate[bot] 20537e068f Update dependency immutable to v4.3.1 (#26029) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 11:39:35 +02:00
renovate[bot] 0d0f6bc223 Update babel monorepo to v7.22.9 (#26017) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 09:38:11 +02:00
Renaud Chaput 8018d7219a Try to improve Renovatebot config (#26005) 2023-07-17 09:33:22 +02:00
Eugen Rochko 45a7291d2c Fix not actually connecting to the configured replica (#25977) 2023-07-17 08:26:52 +02:00
Claire 84c0f759d3 Reduce dropdown menu margin and padding (#2301) 
* Reduce dropdown menu margin and padding

* Change horizontal padding back to what it was

* Reduce separator vertical margins for consistency
 2023-07-16 18:23:07 +02:00
Terence Eden 82b0cfce7e Prevent split line between icon and number on reposts & favourites (#26004) 2023-07-16 10:06:33 +02:00
Claire ce78386c25 Merge pull request #2300 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-14 18:39:37 +02:00
Claire 37e01f530b [Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface 
Port 528a8d0cbe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-14 13:01:31 +02:00
Stanislas Signoud 160af03565 [Glitch] Change links in multi-column mode so tabs are open in single-column mode 
Port 663e9484e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-14 13:01:31 +02:00
Claire 6a458a9baf Remove layout glitch-soc settings 2023-07-14 13:01:31 +02:00
Eugen Rochko 37e80ae4c8 [Glitch] Fix dropdowns being disabled for logged out users in web UI 
Port 3df957104a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-14 13:01:31 +02:00
Claire 8d5e9e02e9 [Glitch] Fix embed dropdown menu item for unauthenticated users 
Port 618eb10d18 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 22:42:15 +02:00
Claire efa6d4416c Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
Plastikmensch 459405d705 Add eslint rule to forbid vanilla imports in glitch (#2293) 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-13 21:36:23 +02:00
Plastikmensch 7714478818 Fix notifications not loading when slow mode active (#2292) 
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.

This change has been missed in f1de5093fb

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-13 21:36:15 +02:00
Claire 2eff80ff5a Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-13 21:35:07 +02:00
Claire b27efe7c22 Fix home timeline's regexp field 2023-07-13 19:33:58 +02:00
Claire 528a8d0cbe Change “About” and “Privacy policy” links to open in a new tab in advanced interface (#25973) 2023-07-13 17:59:15 +02:00
Stanislas Signoud 663e9484e2 Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
Claire 618eb10d18 Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
Matt Jankowski ecf7aa0fb3 Refactor `Status.tagged_with_all` for brakeman SQL injection warning (#25941) 2023-07-13 15:52:37 +02:00
Claire c1bd8248c4 [Glitch] Fix follow link style in embeds 
Port fc6d89573c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 14:52:36 +02:00