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.

Sign up for GitHub

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

Jump to bottom

2025 01 18 1 #47

Merged
merged 423 commits into from
Jan 18, 2025
Merged

2025 01 18 1 #47

merged 423 commits into from
Jan 18, 2025

Conversation

nomad-geek
Copy link

No description provided.

mjankowski and others added 30 commits December 20, 2024 15:15
@mjankowski
Remove un-needed Poll.attached scope (mastodon#33368)
f35de1e
@renovate
Update dependency ioredis to v5.4.2 (mastodon#33375)
b01e8f4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Convert admin/ip_blocks spec controller->system (mastodon#33376)
8770905
@ClearlyClaire
Replace glitch-soc's collapsed toots with upstream's “Read more” (gli…
d65f6c2 
…tch-soc#2916)

* Remove glitch-soc's post collapse feature

* Get rid of the infamous `parseClick`

* Remove unused CSS

* Use upstream's “Read More” implementation

* Update translation strings
@Gargron @ClearlyClaire
[Glitch] Add ability to middle-mouse click posts in web UI
d2fd516 
Port 683db3a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix middle-click handling conflicting with automatic scrolling
5b93331 
Port 9ff0140 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request glitch-soc#2918 from ClearlyClaire/glitch-soc/port…
87e2417 
…/middle-click

Port upstream's middle-click handling changes
@github-actions @web-flow @ClearlyClaire
New Crowdin Translations (automated) (glitch-soc#2907)
76efddf 
* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Fix clicking on status prepends (“X boosted Y”) opening original acco…
57c5905 
…unt in a new tab (glitch-soc#2919)
@ClearlyClaire
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-s…
0aa6948 
…oc/merge-upstream

Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
@Gargron @ClearlyClaire
[Glitch] Refactor <Column> to TypeScript
14fe8c7 
Port 346a27b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@vmstan @ClearlyClaire
[Glitch] Provide option to force use of system scrollbar styling
9363175 
Port 04b7046 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Change percentile label in year in review in web UI
062723c 
Port 6cf8776 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Add ability to search for all accounts when creating a list …
6868b44 
…in web UI

Port 7135f51 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@mokazemi @ClearlyClaire
[Glitch] Set unicode-bidi of account header content to plaintext in s…
fb77bfb 
…tyles

Port b82c791 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Refactor <HashtagHeader> to TypeScript
a8f6ed9 
Port 25387dc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Fix various visual sign-up flow issues
0bf4d49 
Port ca45f89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Fix design of search bar on explore screen in light theme in…
1da3010 
… web UI

Port bf79174 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Add terms of service
cbe88a1 
Port 30aa0df to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ThisIsMissEm @ClearlyClaire
[Glitch] Fix missing top border on Admin Hashtags UI
39ebf70 
Port 6615f17 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Change referrer policy to be controlled by header in web UI
bb17ffa 
Port 425311e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix Chromium showing scrollbar on embedded posts
967e095 
Port 58c5068 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@renchap @ClearlyClaire
[Glitch] Convert polls to Typescript / Immutable Records
37070a7 
Port ded799f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Change label of grouped favourite notification on private me…
9e7a7c7 
…ntions

Port a4560d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@renchap @ClearlyClaire
[Glitch] Fix voting on polls
e5dc03a 
Port da279df to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@mjankowski @ClearlyClaire
[Glitch] Fix long account username leaving container
e516066 
Port 234af14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Change animation on feed generation screen in web UI
2f9efb7 
Port 3cf6681 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Change design of interaction modal in web UI
168d14c 
Port f19fd0b to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Fix rubocop failure in old glitch-soc migration
0d25e4f
@Gargron @ClearlyClaire
[Glitch] Change search to use query params in web UI
c40016b 
Port 0636bcd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
mjankowski and others added 27 commits January 16, 2025 09:09
@mjankowski
Fix Style/MutableConstant cop (mastodon#33602)
3db8498
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33609)
4a44c47 
Co-authored-by: GitHub Actions <noreply@github.com>
@ClearlyClaire
Merge commit from fork
da4e55e
@ClearlyClaire
Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-s…
f6a0cd9 
…oc/merge-upstream
@ClearlyClaire
Merge pull request glitch-soc#2944 from ClearlyClaire/glitch-soc/merg…
4cfa5c1 
…e-upstream

Merge upstream changes up to da4e55e
@ClearlyClaire
Bump version to v4.4.0-alpha.2 (mastodon#33615)
0aa9bb8
@ClearlyClaire
Merge commit '0aa9bb8130b77b01f6a08c64b7e93876d892868b' into glitch-s…
ad3bb61 
…oc/merge-upstream
@ClearlyClaire
Merge pull request glitch-soc#2945 from ClearlyClaire/glitch-soc/merg…
1600192 
…e-upstream

Merge upstream changes up to 0aa9bb8
@mjankowski
Collect errors in setup rake task (mastodon#33603)
69b8a0b
@renovate
Update opentelemetry-ruby (non-major) (mastodon#33613)
da20877 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.178.0 (mastodon#33611)
9e2f930 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency concurrent-ruby to v1.3.5 (mastodon#33610)
29b355b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Move clear environment portion of mastodon:setup to private method (m…
a191414 
…astodon#33616)
@mjankowski
Add coverage for AnnualReport.prepare method (mastodon#33618)
3af6739
@c960657
API for updating attribution domains (mastodon#32730)
a3baae0
@renovate
Update formatjs monorepo (mastodon#33627)
febdfef 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Change activity distribution error handling to skip retrying for dele…
092e60e 
…ted accounts (mastodon#33617)
@renovate
Update dependency tzinfo-data to v1.2025.1 (mastodon#33625)
531ca4b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33626)
1c23ebd 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Migrate visibility interaction checks on statuses to request spec (ma…
5be938e 
…stodon#33622)
@ClearlyClaire
Revert "Update dependency aws-sdk-s3 to v1.178.0 (mastodon#33611)" (m…
b37e48d 
…astodon#33628)
@ClearlyClaire
Further harden the warnings against changing encryption secrets (mast…
ab4874f 
…odon#33631)
@mjankowski
Update CONTRIBUTING doc with various clarifications (mastodon#33517)
bc63f2b
@larouxn
Fix broken CONTRIBUTING link in DEVELOPMENT (mastodon#33637)
4bd969e
@ClearlyClaire
Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-s…
297eb7c 
…oc/merge-upstream

Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
@ClearlyClaire
Merge pull request glitch-soc#2947 from ClearlyClaire/glitch-soc/merg…
0d09884 
…e-upstream

Merge upstream changes up to 4bd969e
@nomad-geek
Merge branch 'main' of https://github.com/glitch-soc/mastodon into 20…
920dc59 
…25-01-18-1
@nomad-geek nomad-geek merged commit d41ee4d into main Jan 18, 2025
23 of 25 checks passed
@nomad-geek nomad-geek deleted the 2025-01-18-1 branch January 18, 2025 18:00
github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 18, 2025
View reviewed changes
spec/models/tag_spec.rb
end

def previous_name_error_message
I18n.t('tags.does_not_match_previous_name')

Check failure

Code scanning / CodeQL

Incomplete regular expression for hostnames High test

This regular expression has an unescaped '.' before 'gnu.org/bugzilla/show_bug', so it might match more hosts than expected.

Copilot Autofix AI 18 days ago

To fix the problem, we need to ensure that all . characters in the regular expression are properly escaped. This will prevent the regular expression from matching unintended hosts. Specifically, we need to update the regular expression used in the HASHTAG_RE constant to escape the . characters.

Suggested changeset 1
spec/models/tag_spec.rb

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -69,3 +69,3 @@
     it 'does not match URLs with hashtag-like anchors after a numeral' do
-      expect(subject.match('https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111895#c4')).to be_nil
+      expect(subject.match('https://gcc\.gnu\.org/bugzilla/show_bug\.cgi?id=111895#c4')).to be_nil
     end
EOF
@@ -69,3 +69,3 @@
it 'does not match URLs with hashtag-like anchors after a numeral' do
expect(subject.match('https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111895#c4')).to be_nil
expect(subject.match('https://gcc\.gnu\.org/bugzilla/show_bug\.cgi?id=111895#c4')).to be_nil
end
Copilot is powered by AI and may make mistakes. Always verify output.
Positive Feedback
Negative Feedback

Provide additional feedback

Please help us improve GitHub Copilot by sharing more details about this comment.

Please select one or more of the options
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.