treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
38,496 Commits
15 Branches
15 Tags
787 MiB
Commit Graph

38496 Commits (f53e7832a2fe2d9d0612cefc3996203e94ec338a)

Author SHA1 Message Date
kouhai dev f53e7832a2 th: DIVERGENCES.md 2023-10-22 16:37:30 -07:00
kouhai dev 2896e187e6 th: deal with "that one spammer" 2023-10-22 16:37:30 -07:00
kouhai dev 6f669d0fd2 th: merge instructions? maybe 2023-10-22 16:36:39 -07:00
kouhai dev 276954bfd0 th: sure. why not. let's interpolate DB_HOST. 2023-10-22 16:36:39 -07:00
kouhai dev e60d9bed75 th: maybe this was a good idea after all 2023-10-22 16:36:39 -07:00
kouhai b24d7bb6f2 th: Merge remote-tracking branch 'glitch/main' (18eacc7a07) 2023-10-22 16:36:39 -07:00
kouhai dev c9dd93df84 th: sorry about the nasty rebase that we did 
not sorry >.<

but still sorry >.>

if you're reading this uh

the "sorry" is mostly for luna/lina, since your changes were a bit more
complex than this

everyone else - hopefully you're not using merge commits,,. this isn't
expected to happen again.
 2023-10-22 16:16:06 -07:00
kouhai 1288d4c9b6 th: Merge remote-tracking branch 'glitch/main' (5efa6ac771) 2023-10-22 16:15:44 -07:00
Claire 18eacc7a07
Merge pull request from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 126cd7705d
 2023-10-21 14:32:30 +02:00
Renaud Chaput 5d9df170cf [Glitch] Do not display the navigation banner in the logo container 
Port 126cd7705d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 20:50:44 +02:00
Claire cc000c8859 Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream 2023-10-19 20:48:22 +02:00
Claire 1c53aec00e
Merge pull request from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9f218c9924
 2023-10-19 20:47:22 +02:00
Brian Campbell 1a3248dc90 [Glitch] Consider shown and pending status in explore prompt calculation 
Port f76e5111f0 to glitch-soc

Co-authored-by: Brian Campbell <brcampbell@beta.team>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 20:23:08 +02:00
Renaud Chaput 41f58e945c [Glitch] The `class` props should be `className` 
Port 10df97c542 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 20:23:08 +02:00
Renaud Chaput 126cd7705d
Do not display the navigation banner in the logo container () 2023-10-19 19:36:08 +02:00
Claire 74fd46d3ab Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream 2023-10-19 19:14:04 +02:00
Claire 918137babc
Merge pull request from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 5ef26d8fd5
 2023-10-19 19:12:51 +02:00
Jeong Arm 68401fc426 [Glitch] Support "in:public" search filter 
Port ad44d832b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 18:56:18 +02:00
Matt Jankowski 9f218c9924
Refactor appeal partial to avoid brakeman XSS warning () 2023-10-19 17:25:54 +02:00
Matt Jankowski bcd0171e5e
Fix `Lint/UselessAssignment` cop () 2023-10-19 16:55:06 +02:00
Daniel M Brasil 7bc8f03162
Add test coverage for `Mastodon::CLI::Accounts#migrate` () 2023-10-19 16:11:15 +02:00
github-actions[bot] 1ffd5a98a9
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-19 14:31:25 +02:00
Brian Campbell f76e5111f0
Consider shown and pending status in explore prompt calculation () 
Co-authored-by: Brian Campbell <brcampbell@beta.team>
 2023-10-19 14:25:57 +02:00
Renaud Chaput 10df97c542
The `class` props should be `className` () 2023-10-19 13:22:44 +02:00
Claire 510845b6b9
Only enable github-rspec for pull_request events () 2023-10-18 15:20:24 +02:00
Matt Jankowski a1b27d8b61
Fix `Naming/VariableNumber` cop () 2023-10-18 14:26:22 +02:00
Emelia Smith 7c3fea7275
Feature: Allow token introspection without read scope () 2023-10-18 14:10:07 +02:00
github-actions[bot] 4612576c68
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-18 11:08:10 +02:00
Matt Jankowski 63a2a4b074
Fix `Performance/DeletePrefix` cop () 2023-10-18 10:32:09 +02:00
Daniel M Brasil 091a21e1bc
Add test coverage for `Mastodon::CLI::Accounts#prune` () 2023-10-18 10:20:50 +02:00
Claire e9dc30cdba
Fix duplicate github annotations for rspec failures () 2023-10-18 10:18:34 +02:00
Claire 0d18c47c18 Enable scheduled actions only on glitch-soc's repo 2023-10-17 22:03:54 +02:00
Claire 63179f0bf4 Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream 2023-10-17 21:59:58 +02:00
Stanislas Signoud 8bbbd012d4 [Glitch] Fix missing redirections to make sure /home redirect to the advanced UI 
Port 935d54124e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-17 21:48:36 +02:00
Claire c10a667ac2 Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream 2023-10-17 21:42:49 +02:00
Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.

Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`.
 2023-10-17 21:35:07 +02:00
Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
 2023-10-17 20:59:18 +02:00
Nick Schonning 5ef26d8fd5
Add RSpec GitHub annotations gem () 2023-10-17 18:28:09 +02:00
Matt Jankowski 71447ab19f
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features/admin area () 2023-10-17 16:57:19 +02:00
renovate[bot] 0036de46bc
Update dependency rubocop-performance to v1.19.1 () 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-17 16:16:12 +02:00
Jeong Arm ad44d832b8
Support "in:public" search filter () 2023-10-17 16:12:03 +02:00
Matt Jankowski 2528a0721f
Update `rubocop-capybara` to version 2.19.0 () 2023-10-17 16:10:50 +02:00
renovate[bot] 1996fb6fd6
Update dependency puma to v6.4.0 () 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-17 16:10:16 +02:00
Matt Jankowski 65cd0700e4
Refactor domains cli to remove model call from regex () 2023-10-17 15:58:42 +02:00
Claire b34a2b1b33
Fix errors in CLI specs () 2023-10-17 15:30:12 +02:00
Jeong Arm c0cda1adaf
Let use http_hidden_proxy on docker-compose () 2023-10-17 15:24:45 +02:00
Renaud Chaput 1fb4e40145
Run scheduled actions only on the main repo () 2023-10-17 14:59:39 +02:00
Stanislas Signoud 935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI () 2023-10-17 14:59:07 +02:00
Victor Lee c4bddc9855
Add spec for poll model () 
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-17 14:56:24 +02:00
Matt Jankowski 12bb7be8b5
Spec speed ups on `AccountsController` spec () 2023-10-17 13:32:10 +02:00