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

Reset to upstream v4.2.8 with select changes #68

Merged
merged 247 commits into from
Feb 29, 2024
Merged

Reset to upstream v4.2.8 with select changes #68

merged 247 commits into from
Feb 29, 2024

Commits on Mar 6, 2023

  1. remove "Create account" signup button

    @toufali
    toufali committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    1c2c814 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Make the "I don't like it" category let you report an account 

    This makes it so that when a user reports an account and selects "I don't like it", instead of getting a message about how they should personally block that person, it sends them to the normal reporting interface and they can file their report.

Fixes mastodon#1202

Signed-off-by: Robert Helmer <rhelmer@mozilla.com>
    @dariusk @rhelmer
    dariusk authored and rhelmer committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    b06e34c View commit details
    Browse the repository at this point in the history

  2. link directly to auth without interstitial

    @toufali
    toufali committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    7449914 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from mozilla/MZTDN-89/remove-signup-button 

    remove "Create account" signup button
    @toufali
    toufali authored Mar 7, 2023
    Configuration menu
    Copy the full SHA
    149dc36 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from mozilla/MZTDN-100-enable-dislike-reports 

    Make the "I don't like it" category let you report an account
    @rhelmer
    rhelmer authored Mar 7, 2023
    Configuration menu
    Copy the full SHA
    e34429a View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/main'

    @rhelmer
    rhelmer committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    5512b5b View commit details
    Browse the repository at this point in the history

  6. Make the "I don't like it" category let you report an account 

    This makes it so that when a user reports an account and selects "I don't like it", instead of getting a message about how they should personally block that person, it sends them to the normal reporting interface and they can file their report.

Fixes mastodon#1202

Signed-off-by: Robert Helmer <rhelmer@mozilla.com>
    @dariusk @rhelmer
    dariusk authored and rhelmer committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    ae86914 View commit details
    Browse the repository at this point in the history

  7. remove "Create account" signup button

    @toufali @rhelmer
    toufali authored and rhelmer committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    a9e26a7 View commit details
    Browse the repository at this point in the history

  8. link directly to auth without interstitial

    @toufali @rhelmer
    toufali authored and rhelmer committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    38b6ea6 View commit details
    Browse the repository at this point in the history

  9. direct user to homepage after logout/sign-out

    @toufali
    toufali committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    605f7d7 View commit details
    Browse the repository at this point in the history

  10. fix no-unused-vars lint

    @toufali
    toufali committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    7404825 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #5 from mozilla/update-path-after-sign-out 

    direct user to homepage after logout/sign-out
    @toufali
    toufali authored Mar 7, 2023
    Configuration menu
    Copy the full SHA
    fcf1880 View commit details
    Browse the repository at this point in the history

  12. MZTDN-100 - followup to add dislike as report category

    @rhelmer
    rhelmer committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    97d35d1 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #4 from mozilla/MZTDN-100-enable-dislike-category 

    MZTDN-100 - followup to add dislike as report category
    @rhelmer
    rhelmer authored Mar 7, 2023
    Configuration menu
    Copy the full SHA
    7199c68 View commit details
    Browse the repository at this point in the history

  14. MZTDN-100 - followup to add dislike as report category

    @rhelmer
    rhelmer committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    8af8e1b View commit details
    Browse the repository at this point in the history

  15. direct user to homepage after logout/sign-out

    @toufali @rhelmer
    toufali authored and rhelmer committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    5e3e613 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Revert "MZTDN-100 - followup to add dislike as report category" 

    This reverts commit 97d35d1.
    @rhelmer
    rhelmer committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    7558b48 View commit details
    Browse the repository at this point in the history

  2. Revert "Make the "I don't like it" category let you report an account" 

    This reverts commit b06e34c.
    @rhelmer
    rhelmer committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    336ec56 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from mozilla/revert-MZTDN-100 

    Revert mztdn 100
    @rhelmer
    rhelmer authored Mar 8, 2023
    Configuration menu
    Copy the full SHA
    467bb80 View commit details
    Browse the repository at this point in the history

  4. Revert "Make the "I don't like it" category let you report an account" 

    This reverts commit b06e34c.
    @rhelmer
    rhelmer committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    30df496 View commit details
    Browse the repository at this point in the history

  5. Revert "MZTDN-100 - followup to add dislike as report category" 

    This reverts commit 97d35d1.
    @rhelmer
    rhelmer committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    b6a0df3 View commit details
    Browse the repository at this point in the history

  6. remove sign-up button from mobile header

    @toufali
    toufali committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    5c3f4c8 View commit details
    Browse the repository at this point in the history

  7. remove interstitial login link

    @toufali
    toufali committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    dec728b View commit details
    Browse the repository at this point in the history

  8. Merge pull request #7 from mozilla/MZTDN-89/remove-mobile-sign-up-button 

    Mztdn 89/remove mobile sign up button
    @toufali
    toufali authored Mar 8, 2023
    Configuration menu
    Copy the full SHA
    dc5f73f View commit details
    Browse the repository at this point in the history

  9. add OIDC issuer to form-action CSP directive

    @toufali
    toufali committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    9ff747f View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Merge pull request #8 from mozilla/MZTDN-107/fix-form-action-CSP 

    add OIDC issuer to form-action CSP directive
    @toufali
    toufali authored Mar 9, 2023
    Configuration menu
    Copy the full SHA
    47df355 View commit details
    Browse the repository at this point in the history

  2. add OIDC issuer to form-action CSP directive

    @toufali @rhelmer
    toufali authored and rhelmer committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    b1759df View commit details
    Browse the repository at this point in the history

  3. remove sign-up button from mobile header

    @toufali @rhelmer
    toufali authored and rhelmer committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    1752080 View commit details
    Browse the repository at this point in the history

  4. remove interstitial login link

    @toufali @rhelmer
    toufali authored and rhelmer committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    1540c88 View commit details
    Browse the repository at this point in the history

  5. set oidc_issuer fallback for build phase empty var

    @toufali
    toufali committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    160fd2b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #9 from mozilla/MZTDN-107/fix-form-action-CSP 

    set oidc_issuer fallback for build phase empty var
    @toufali
    toufali authored Mar 9, 2023
    Configuration menu
    Copy the full SHA
    efa3915 View commit details
    Browse the repository at this point in the history

  7. set oidc_issuer fallback for build phase empty var

    @toufali
    toufali committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    08a994b View commit details
    Browse the repository at this point in the history

  8. add fxa stage and prod urls to form-action CSP

    @toufali
    toufali committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    8272f7d View commit details
    Browse the repository at this point in the history

  9. Merge pull request #10 from mozilla/MZTDN-107/add-fxa-to-csp 

    add fxa stage and prod urls to `form-action` CSP
    @rhelmer
    rhelmer authored Mar 9, 2023
    Configuration menu
    Copy the full SHA
    52c998d View commit details
    Browse the repository at this point in the history

  10. add fxa stage and prod urls to form-action CSP

    @toufali @rhelmer
    toufali authored and rhelmer committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    d150449 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. add Mozilla Content Moderation Policy and Terms of Service (#11) 

    * add Mozilla Content Moderation Policy and Terms of Service, with redirects
    @rhelmer
    rhelmer authored Mar 10, 2023
    Configuration menu
    Copy the full SHA
    1c6113b View commit details
    Browse the repository at this point in the history

  2. add Mozilla Content Moderation Policy and Terms of Service (#11) 

    * add Mozilla Content Moderation Policy and Terms of Service, with redirects
    @rhelmer
    rhelmer committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    a3b30b6 View commit details
    Browse the repository at this point in the history

  3. correct mailto: link

    @rhelmer
    rhelmer committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    70cbff2 View commit details
    Browse the repository at this point in the history

  4. correct mailto: link (#12)

    @rhelmer
    rhelmer authored Mar 10, 2023
    Configuration menu
    Copy the full SHA
    4cbfb4e View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. Fix “Remove all followers from the selected domains” being more destr… 

    …uctive than it claims (mastodon#23805)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    0dc342d View commit details
    Browse the repository at this point in the history

  2. dot is not allowed (mastodon#23519)

    @emilweth @ClearlyClaire
    emilweth authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    ac76651 View commit details
    Browse the repository at this point in the history

  3. fix metrics format (mastodon#23520)

    @emilweth @ClearlyClaire
    emilweth authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    ea1d55a View commit details
    Browse the repository at this point in the history

  4. Fix case-sensitive check for previously used hashtags (mastodon#23526)

    @deanveloper @ClearlyClaire
    deanveloper authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    11d6663 View commit details
    Browse the repository at this point in the history

  5. Fix focus point of already-attached media not saving after edit (mast… 

    …odon#23566)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    9007901 View commit details
    Browse the repository at this point in the history

  6. Fix sidebar cut-off on small screens in admin UI (mastodon#23764)

    @wxt2005 @ClearlyClaire
    wxt2005 authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    00208b2 View commit details
    Browse the repository at this point in the history

  7. Fix inefficiency when searching accounts per username in admin interf… 

    …ace (mastodon#23801)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    69564db View commit details
    Browse the repository at this point in the history

  8. Fix duplicate “Publish” button on mobile (mastodon#23804)

    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    b52746e View commit details
    Browse the repository at this point in the history

  9. Fix server error when failing to follow back followers from `/relatio… 

    …nships` (mastodon#23787)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    aff3f85 View commit details
    Browse the repository at this point in the history

  10. Fix error when displaying post history of a trendable post in the adm… 

    …in interface (mastodon#23574)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    63532d9 View commit details
    Browse the repository at this point in the history

  11. Fix tootctl accounts migrate error due to typo (mastodon#23567)

    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    f5f17e8 View commit details
    Browse the repository at this point in the history

  12. Fix unconfirmed accounts being registered as active users (mastodon#2… 

    …3803)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    675c24a View commit details
    Browse the repository at this point in the history

  13. Fix original account being unfollowed on migration before the follow … 

    …request could be sent (mastodon#21957)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    4cec3ad View commit details
    Browse the repository at this point in the history

  14. Do not leave Mastodon when clicking “Back” (mastodon#23953)

    @c960657 @ClearlyClaire
    c960657 authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    37a28ba View commit details
    Browse the repository at this point in the history

  15. Fix pgBouncer resetting application name on every transaction (mastod… 

    …on#23958)
    @Gargron @ClearlyClaire
    Gargron authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    2fed61a View commit details
    Browse the repository at this point in the history

  16. Fix /api/v1/streaming sub-paths not being redirected (mastodon#23988)

    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    4bfbeb8 View commit details
    Browse the repository at this point in the history

  17. Center the text itself in upload area (mastodon#24029)

    @vintprox @ClearlyClaire
    vintprox authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    14bcd14 View commit details
    Browse the repository at this point in the history

  18. Fix sidekiq jobs not triggering Elasticsearch index updates (mastodon… 

    …#24046)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    479b666 View commit details
    Browse the repository at this point in the history

  19. Do not strip tags from Setting.site_short_description (mastodon#23975)

    @c960657 @ClearlyClaire
    c960657 authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    92a2663 View commit details
    Browse the repository at this point in the history

  20. Unescape HTML entities (mastodon#24019)

    @c960657 @ClearlyClaire
    c960657 authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    3f2e318 View commit details
    Browse the repository at this point in the history

  21. Fix paths with url-encoded @ to redirect to the correct path (mastodo… 

    …n#23593)
    @thijskh @ClearlyClaire
    thijskh authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    40ae8d5 View commit details
    Browse the repository at this point in the history

  22. Add lang tag to native language names in language picker (mastodon#… 

    …23749)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    9377c4a View commit details
    Browse the repository at this point in the history

  23. Add mail headers to avoid auto-replies (mastodon#23597)

    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    cec5941 View commit details
    Browse the repository at this point in the history

  24. Add refreshing many accounts at once with "tootctl accounts refresh" (m… 

    …astodon#23304)
    @9p4 @ClearlyClaire
    9p4 authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    78c7c79 View commit details
    Browse the repository at this point in the history

  25. add modal message when editing toot (mastodon#23936) 

    Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
    @PauloVilarinho @ClearlyClaire
    2 people authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    9972eb4 View commit details
    Browse the repository at this point in the history

  26. Increase contrast of upload progress background (mastodon#23836)

    @toolmantim @ClearlyClaire
    toolmantim authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    a133570 View commit details
    Browse the repository at this point in the history

  27. Change auto-deletion throttling constants to better scale with server… 

    … size (mastodon#23320)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    68af19c View commit details
    Browse the repository at this point in the history

  28. Switched bookmark and favourites around (mastodon#23701)

    @ClearlyClaire
    Terry Garcia authored and ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    a54bd84 View commit details
    Browse the repository at this point in the history

  29. Change unintended SMTP read timeout from 5 seconds to 20 seconds (mas… 

    …todon#23750)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    2a37dc7 View commit details
    Browse the repository at this point in the history

  30. Change ActivityPub::DeliveryWorker retries to be spread out more (m… 

    …astodon#21956)
    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    6962d11 View commit details
    Browse the repository at this point in the history

  31. Update changelog

    @ClearlyClaire
    ClearlyClaire committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    fe7752f View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. Support the PROXY protocol through the PROXY_PROTO_V1 env variable (m… 

    …astodon#24064)
    @CSDUMMI @ClearlyClaire
    CSDUMMI authored and ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    4e02c7d View commit details
    Browse the repository at this point in the history

  2. Add SENDFILE_HEADER environment variable (mastodon#24123)

    @Gargron @ClearlyClaire
    Gargron authored and ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    5cc39a3 View commit details
    Browse the repository at this point in the history

  3. Add cache headers to static files served through Rails (mastodon#24120)

    @Gargron @ClearlyClaire
    Gargron authored and ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    59a2fe3 View commit details
    Browse the repository at this point in the history

  4. Push Docker images to Github Container Registry as well (mastodon#24101)

    @renchap @ClearlyClaire
    renchap authored and ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    0529fb0 View commit details
    Browse the repository at this point in the history

  5. Skip Docker CI Login/Push on forks (mastodon#23564)

    @nschonni @ClearlyClaire
    nschonni authored and ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    0891a8d View commit details
    Browse the repository at this point in the history

  6. Use Github Container Registry as the official container image source (m… 

    …astodon#24113)
    @renchap @ClearlyClaire
    renchap authored and ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    4213907 View commit details
    Browse the repository at this point in the history

  7. Skip pushing containers on forks (mastodon#24106)

    @nschonni @ClearlyClaire
    nschonni authored and ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    46d6cb0 View commit details
    Browse the repository at this point in the history

  8. Fix dashboard crash on ElasticSearch server error (mastodon#23751)

    @ClearlyClaire
    ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    0363064 View commit details
    Browse the repository at this point in the history

  9. Fix incorrect post links in strikes when the account is remote (masto… 

    …don#23611)
    @ClearlyClaire
    ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    cc65f32 View commit details
    Browse the repository at this point in the history

  10. Fix misleading error code when receiving invalid WebAuthn credentials (… 

    …mastodon#23568)
    @ClearlyClaire
    ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    8c4ea7d View commit details
    Browse the repository at this point in the history

  11. Update changelog

    @ClearlyClaire
    ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    0e58e7f View commit details
    Browse the repository at this point in the history

  12. Update changelog

    @ClearlyClaire
    ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    19def1a View commit details
    Browse the repository at this point in the history

  13. Change user backups to use expiring URLs for download when possible (m… 

    …astodon#24136)
    @Gargron @ClearlyClaire
    Gargron authored and ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    6db7687 View commit details
    Browse the repository at this point in the history

  14. Add warning for object storage misconfiguration (mastodon#24137)

    @ClearlyClaire
    ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    6a7b91a View commit details
    Browse the repository at this point in the history

  15. Bump version to v4.1.1

    @ClearlyClaire
    ClearlyClaire committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    ab85f59 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Merge tag 'v4.1.1' into release-mozilla-social

    @rhelmer
    rhelmer committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    c69480b View commit details
    Browse the repository at this point in the history

  2. Fix inconsistent moderation policy style (#13) 

    * make the content moderation style more consistent with terms-of-service

* provide IDs so sections can be linked to
    @rhelmer
    rhelmer authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    4ee5693 View commit details
    Browse the repository at this point in the history

  3. Merge upstream (#14) 

    * Skip double building on Dependabot branches (mastodon#24025)

* Bump pg from 1.4.5 to 1.4.6 (mastodon#24001)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump yargs from 17.7.0 to 17.7.1 (mastodon#24002)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump sidekiq-scheduler from 5.0.1 to 5.0.2 (mastodon#24004)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump rack from 2.2.6.2 to 2.2.6.3 (mastodon#23997)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump axios from 1.3.3 to 1.3.4 (mastodon#23996)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump utf-8-validate from 6.0.2 to 6.0.3 (mastodon#23992)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump omniauth_openid_connect from 0.6.0 to 0.6.1 (mastodon#23991)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump doorkeeper from 5.6.4 to 5.6.5 (mastodon#24009)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jest from 29.4.3 to 29.5.0 (mastodon#24003)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jest-environment-jsdom from 29.4.3 to 29.5.0 (mastodon#23998)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump rubocop from 1.45.1 to 1.48.0 (mastodon#23999)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump mkdirp from 2.1.3 to 2.1.5 (mastodon#23994)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump babel-jest from 29.4.3 to 29.5.0 (mastodon#24007)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add refreshing many accounts at once with "tootctl accounts refresh" (mastodon#23304)

* Skip rebase-needed job for i10n branch (mastodon#24026)

* Unescape HTML entities (mastodon#24019)

* Explicitly set github repo in instance presenter spec (mastodon#24036)

* Center the text itself in upload area (mastodon#24029)

* Sync CI and Docker Compose image versions (mastodon#24053)

* Bump puma from 6.1.0 to 6.1.1 (mastodon#24045)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Serializers spec coverage (mastodon#24017)

* Coverage improvement round-out following up previous work (mastodon#23987)

* Bump pghero from 3.1.0 to 3.2.0 (mastodon#24044)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump eslint from 8.33.0 to 8.35.0 (mastodon#24049)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Enable RSpec/FilePath (mastodon#23965)

* Add basic search specs for chewy indexes (mastodon#24065)

* Fix sidekiq jobs not triggering Elasticsearch index updates (mastodon#24046)

* Enable Rubocop Performance/DeleteSuffix (mastodon#24077)

* Prefer the stored location as after_sign_in_path in Omniauth Callback Controller (mastodon#24073)

* Bump jsdom from 21.1.0 to 21.1.1 (mastodon#24090)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pghero from 3.2.0 to 3.3.0 (mastodon#24085)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Support the PROXY protocol through the PROXY_PROTO_V1 env variable (mastodon#24064)

* Bump rack from 2.2.6.3 to 2.2.6.4 (mastodon#24097)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump rails from 6.1.7.2 to 6.1.7.3 (mastodon#24096)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump rubocop from 1.48.0 to 1.48.1 (mastodon#24095)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Push Docker images to Github Container Registry as well (mastodon#24101)

* Skip Docker CI Login/Push on forks (mastodon#23564)

* Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (mastodon#24034)

* Redirect users to SLO at the IdP after logging them out of Mastodon. (mastodon#24020)

* Add spec for the CLI `version` task (mastodon#23978)

* Update PostCSS dependencies (mastodon#23835)

* Fix dashboard crash on ElasticSearch server error (mastodon#23751)

* Fix incorrect post links in strikes when the account is remote (mastodon#23611)

* Fix misleading error code when receiving invalid WebAuthn credentials (mastodon#23568)

* Setup haml-lint CI with todo config (mastodon#23524)

* Use Github Container Registry as the official container image source (mastodon#24113)

* Skip pushing containers on forks (mastodon#24106)

* Fix more haml-lint Rubocop (mastodon#24107)

* Autofix Rubocop Style/PreferredHashMethods (mastodon#23851)

* Bump rack-test from 2.0.2 to 2.1.0 (mastodon#24112)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Autofix Rubocop Style/RedundantArgument (mastodon#23798)

* Bump immutable from 4.2.4 to 4.3.0 (mastodon#24088)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @babel/eslint-parser from 7.19.1 to 7.21.3 (mastodon#24109)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump eslint from 8.35.0 to 8.36.0 (mastodon#24089)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Remove `bullet` and `active_record_query_trace` gems (mastodon#24121)

* Add `SENDFILE_HEADER` environment variable (mastodon#24123)

* Bump @babel/core from 7.21.0 to 7.21.3 (mastodon#24111)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add cache headers to static files served through Rails (mastodon#24120)

* Bump autoprefixer from 10.4.13 to 10.4.14 (mastodon#24108)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump sass from 1.58.3 to 1.59.3 (mastodon#24105)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Regen rubocop-todo without Max shadowing (mastodon#24076)

* Refactor monkey-patching of `PrivateAddressCheck` (mastodon#24122)

* Replace `Status#translatable?` with language matrix in separate endpoint (mastodon#24037)

* New Crowdin updates (mastodon#23904)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

* Roll back unintentionally activated rubocop rules (mastodon#24132)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>

* Change user backups to use expiring URLs for download when possible (mastodon#24136)

* Add warning for object storage misconfiguration (mastodon#24137)

* Ignore additional Style/OptionalBooleanParameter (mastodon#24138)

* Bump glob from 8.1.0 to 9.3.0 (mastodon#24110)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump rimraf from 4.1.2 to 4.4.0 (mastodon#24048)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Link to the Identity provider's account settings from the account settings (mastodon#24100)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Include config/ and update all rubcop deps (mastodon#23963)

* Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (mastodon#24142)

Co-authored-by: Jean Boussier <jean.boussier@gmail.com>

* Dedupe yarn.lock with yarn-deduplicate (mastodon#24119)

* Revert "Dedupe yarn.lock with yarn-deduplicate" (mastodon#24155)

* Upgrade redis-node to latest (mastodon#24154)

* Webhooks for local status.create, status.update, account.update (mastodon#24133)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 9p4 <vcs@ersei.net>
Co-authored-by: Christian Schmidt <github@chsc.dk>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Rodion Borisov <vintprox@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: CSDUMMI <31551856+CSDUMMI@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Jean byroot Boussier <jean.boussier+github@shopify.com>
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
Co-authored-by: Vyr Cossont <VyrCossont@users.noreply.github.com>
    @rhelmer @nschonni
    @dependabot @9p4 @c960657 @mjankowski @vintprox @ClearlyClaire @CSDUMMI @renchap @Gargron @ykzts @casperisfine @byroot @VyrCossont
    15 people authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    b6b9810 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'mastodon:main' into main

    @rhelmer
    rhelmer authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    fbb9f7d View commit details
    Browse the repository at this point in the history

  5. ignore unused signup button

    @rhelmer
    rhelmer committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    286927b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #15 from mozilla/merge-v4.1.1 

    Merge v4.1.1
    @rhelmer
    rhelmer authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    b9e7334 View commit details
    Browse the repository at this point in the history

  7. Fix inconsistent moderation policy style (#13) 

    * make the content moderation style more consistent with terms-of-service

* provide IDs so sections can be linked to
    @rhelmer
    rhelmer committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    251bd37 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'release-mozilla-social' of https://github.com/mozilla/m… 

    …astodon into release-mozilla-social
    @rhelmer
    rhelmer committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    6e371bc View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. Fix crash in tootctl commands making use of parallelization when El… 

    …asticsearch is enabled (mastodon#24182)
    @ClearlyClaire
    ClearlyClaire committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    3c82c4e View commit details
    Browse the repository at this point in the history

  2. Fix user archive takeout when using OpenStack Swift or S3 providers w… 

    …ith no ACL support (mastodon#24200)
    @ClearlyClaire
    ClearlyClaire committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    ae64c5b View commit details
    Browse the repository at this point in the history

  3. Bump blurhash from 0.1.6 to 0.1.7 (mastodon#23517)

    @Gargron @ClearlyClaire
    Gargron authored and ClearlyClaire committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    590df44 View commit details
    Browse the repository at this point in the history

  4. Wrap db:setup with Chewy.strategy(:mastodon) (mastodon#24302)

    @rrgeorge @ClearlyClaire
    rrgeorge authored and ClearlyClaire committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    af6eb37 View commit details
    Browse the repository at this point in the history

  5. Update Ruby to 3.0.6 (mastodon#24334)

    @saizai @ClearlyClaire
    saizai authored and ClearlyClaire committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    0161753 View commit details
    Browse the repository at this point in the history

  6. Fix invalid/expired invites being processed on sign-up (mastodon#24337)

    @ClearlyClaire
    ClearlyClaire committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    51572ac View commit details
    Browse the repository at this point in the history

  7. Change root Chewy strategy to emit a warning instead of erroring out … 

    …in production mode (mastodon#24327)
    @ClearlyClaire
    ClearlyClaire committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    4eaa6d5 View commit details
    Browse the repository at this point in the history

  8. Fix unescaped user input in LDAP query (mastodon#24379) 

    Fix CVE-2023-28853
    @ClearlyClaire
    ClearlyClaire committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    b9f2713 View commit details
    Browse the repository at this point in the history

  9. Bump version to v4.1.2

    @ClearlyClaire
    ClearlyClaire committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    4b9e4f6 View commit details
    Browse the repository at this point in the history

  10. Merge tag 'v4.1.2' into release-mozilla-social

    @cvalaas
    cvalaas committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    f8fa721 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Prefer the stored location as after_sign_in_path in Omniauth Callback… 

    … Controller (mastodon#24073)
    @CSDUMMI @aaga
    CSDUMMI authored and aaga committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    019a6de View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Merge pull request #17 from mozilla/fix-3rd-party-login 

    Prefer the stored location as after_sign_in_path in Omniauth Callback Controller
    @aaga
    aaga authored Apr 21, 2023
    Configuration menu
    Copy the full SHA
    2d7937f View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. add terms of service

    @toufali
    toufali committed May 1, 2023
    Configuration menu
    Copy the full SHA
    939f1a5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #18 from mozilla/add-terms-of-service 

    add terms of service
    @toufali
    toufali authored May 1, 2023
    Configuration menu
    Copy the full SHA
    67c0cff View commit details
    Browse the repository at this point in the history

  3. add terms of service 

    (cherry picked from commit 939f1a5)
    @toufali
    toufali committed May 1, 2023
    Configuration menu
    Copy the full SHA
    f4b77de View commit details
    Browse the repository at this point in the history

  4. fix jsx extension incompatible with release branch

    @toufali
    toufali committed May 1, 2023
    Configuration menu
    Copy the full SHA
    1b51087 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Change wordmark logo from Mastodon to Mozilla

    @aaga
    aaga committed May 3, 2023
    Configuration menu
    Copy the full SHA
    4bcef0c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #19 from mozilla/change-logo 

    Change wordmark logo from Mastodon to Mozilla
    @than-mozilla
    than-mozilla authored May 3, 2023
    Configuration menu
    Copy the full SHA
    402eecc View commit details
    Browse the repository at this point in the history

  3. Change wordmark logo from Mastodon to Mozilla

    @aaga
    aaga committed May 3, 2023
    Configuration menu
    Copy the full SHA
    b350c17 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #20 from mozilla/change-logo-release 

    Change wordmark logo from Mastodon to Mozilla
    @aaga
    aaga authored May 3, 2023
    Configuration menu
    Copy the full SHA
    d6672d5 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Add ENV var to enable skip_authorization for specified redirect URIs

    @aaga
    aaga committed May 24, 2023
    Configuration menu
    Copy the full SHA
    9f3d39e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #21 from mozilla/auto-authorize-elk-app 

    Add ENV var to enable skip_authorization for specified redirect URIs
    @aaga
    aaga authored May 24, 2023
    Configuration menu
    Copy the full SHA
    d72a73b View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Add ENV var to enable skip_authorization for specified redirect URIs

    @aaga
    aaga committed May 25, 2023
    Configuration menu
    Copy the full SHA
    f56e837 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. add param middleware to omniauth

    @toufali
    toufali committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    cec88fc View commit details
    Browse the repository at this point in the history

  2. reenable registration button with signup param

    @toufali
    toufali committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    2550050 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. change signup param to intent=signup

    @toufali
    toufali committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    e23e918 View commit details
    Browse the repository at this point in the history

  2. enable sign-up button in mobile view and others

    @toufali
    toufali committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    6397063 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge pull request #22 from mozilla/separate-signup-button 

    Separate signup button
    @bakulf
    bakulf authored Jun 9, 2023
    Configuration menu
    Copy the full SHA
    d32197b View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Merge remote-tracking branch 'upstream/main' into release-mozilla-social

    @toufali
    toufali committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    069a0dd View commit details
    Browse the repository at this point in the history

  2. skip OIDC sign-out modal to redirect root

    @toufali
    toufali committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    c61ae57 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. revert skip_csrf_meta_tags to allow direct login

    @toufali
    toufali committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    3ffdb83 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into release-mozilla-social

    @toufali
    toufali committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    ac6e79a View commit details
    Browse the repository at this point in the history

  3. change copy to "Sign in" instead of "Login"

    @toufali
    toufali committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    0d7ba8a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #23 from mozilla/SOCIALPLAT-36/merge-upstream-mast… 

    …odon

merge upstream mastodon and `main`
    @toufali
    toufali authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    8e2b2b0 View commit details
    Browse the repository at this point in the history

  5. delete index.js terms in favor of index.jsx

    @toufali
    toufali committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    a95c2ce View commit details
    Browse the repository at this point in the history

  6. fix improper export of TermsOfService class

    @toufali
    toufali committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    456f44f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #25 from mozilla/SOCIALPLAT-36/fix-broken-terms-of… 

    …-service

Fix broken terms of service
    @toufali
    toufali authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    b073aef View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Merge branch 'release-mozilla-social' into main-merge-release-mozilla… 

    …-social
    @toufali
    toufali committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    102a9c1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #26 from mozilla/main-merge-release-mozilla-social 

    Merge `release-mozilla-social` into `main`
    @toufali
    toufali authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    80ea64b View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. add comment to track upstream regex change

    @toufali
    toufali committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    9a85d71 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Merge pull request #27 from mozilla/SOCIALPLAT-307/track-regex-upstre… 

    …am-change

add comment to track upstream regex change
    @toufali
    toufali authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    d662634 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. feat(application_controller): adding an initial around action for spe… 

    …cial log message to test
    Braun committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a640a7f View commit details
    Browse the repository at this point in the history

  2. feat(glean_helper): adding glean_helper to put logging code

    Braun committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a2bf243 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. feat(glean_helpers): adding initial glean log implementation

    Braun committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    27fd717 View commit details
    Browse the repository at this point in the history

  2. feat(glean_helpers): fixing issues with new fields added to event

    Braun committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    d8ff2f1 View commit details
    Browse the repository at this point in the history

  3. feat(glean-helper): removing unneeded local call

    Braun committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    ff81a80 View commit details
    Browse the repository at this point in the history

  4. feat: fixing typo

    Braun committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    2982dfb View commit details
    Browse the repository at this point in the history

  5. feat(glean-helper): use the proper field for account id

    Braun committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    9f98dd0 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Add direct link to the Single-Sign On provider if there is only one s… 

    …ign up method available (mastodon#26083)
    @toufali
    toufali committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    a9b14cc View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Merge pull request #32 from MozillaSocial/masto-upstream-direct-sso-2 

    Cherry-pick upstream 120f580 alternate - direct link to SSO
    @bakulf
    bakulf authored Aug 15, 2023
    Configuration menu
    Copy the full SHA
    8bbee70 View commit details
    Browse the repository at this point in the history

  2. Add auto-redirect script for single auth-provider case

    @aaga
    aaga committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    4fe0aa5 View commit details
    Browse the repository at this point in the history

  3. fix(missing.png): replace default avatar image

    @wtfluckey
    wtfluckey committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    3dda47a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #33 from MozillaSocial/fix/replace-default-avatar 

    fix(missing.png): replace default avatar image - SOCIALPLAT-425
    @aaga
    aaga authored Aug 15, 2023
    Configuration menu
    Copy the full SHA
    93e19e4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #29 from MozillaSocial/skip-login-interstitial 

    Replace 'Login with...' page with auto-redirect script
    @aaga
    aaga authored Aug 15, 2023
    Configuration menu
    Copy the full SHA
    7107548 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Load auto-redirect script as a module instead

    @aaga
    aaga committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    8fa0741 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35 from MozillaSocial/auto-redirect-script-patch 

    Patch: load auto-redirect script as a module instead
    @aaga
    aaga authored Aug 16, 2023
    Configuration menu
    Copy the full SHA
    1d53f73 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. feat(application-controller): adding the auto-gnerated glean loggee

    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    de5e13b View commit details
    Browse the repository at this point in the history

  2. feat(glean-helper): adding updated code to fix commenting issue

    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    44961fe View commit details
    Browse the repository at this point in the history

  3. feat(application-controller): fixing typo

    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    ead614e View commit details
    Browse the repository at this point in the history

  4. feat(application-controller): was using the wrong glean helper class … 

    …name
    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    b149aba View commit details
    Browse the repository at this point in the history

  5. feat(glean-helper): removing unused argument

    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    d60a9e4 View commit details
    Browse the repository at this point in the history

  6. feat(glean-helper): fixing string formatting on the logger

    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    5af77bd View commit details
    Browse the repository at this point in the history

  7. feat(application-controller): using proper keyword argument practice

    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    aa084ae View commit details
    Browse the repository at this point in the history

  8. feat(glean-helper): still trying to get the keyword argument logic right

    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    d604749 View commit details
    Browse the repository at this point in the history

  9. feat(application-controller): version should be string

    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    16a848f View commit details
    Browse the repository at this point in the history

  10. feat(glean): need to make sure metrics are strings

    Braun committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    ba95f2b View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. docs(glean): updating data_sensitivity to interaction

    Braun committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    dbec5e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. docs(glean): updating metrics.yaml

    Braun committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    780e670 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. fix(auth): allow any client to make a signout call (#38)

    @bassrock
    bassrock authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    931c5d0 View commit details
    Browse the repository at this point in the history

  2. Migrate Dockerfile to Bookworm (mastodon#26802) (#39) 

    Co-authored-by: Michael Stanclift <mx@vmstan.com>
    @bassrock @vmstan
    bassrock and vmstan authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    9fb36f6 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Update index.jsx 

    Update terms page with new address
    @awmcd
    awmcd authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    2f70fe9 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. Merge pull request #40 from MozillaSocial/awmcd-patch-1 

    Update tos index.jsx
    @toufali
    toufali authored Sep 13, 2023
    Configuration menu
    Copy the full SHA
    20952f9 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. Add Admin-level Status API with show, destroy, unsensitive

    @aaga
    aaga committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    53a6cba View commit details
    Browse the repository at this point in the history

  2. Add Admin-level Status Action API with delete and sensitive actions

    @aaga
    aaga committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    1266053 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Add by_moderator flag to Admin Status DELETE method

    @aaga
    aaga committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    3eacba2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #41 from MozillaSocial/admin-action-statuses 

    Add Admin-level API for actioning Statuses
    @aaga
    aaga authored Sep 15, 2023
    Configuration menu
    Copy the full SHA
    b796d6b View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. feat(glean): updating logic to use glean Event Stream pattern

    Braun committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    a3496a0 View commit details
    Browse the repository at this point in the history

  2. feat(glean): fixing issues with how struct was being used and fixing … 

    …issues with helper code
    Braun committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    2605a7e View commit details
    Browse the repository at this point in the history

  3. feat(glean): adding new version of glean_helper

    Braun committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    aa08d45 View commit details
    Browse the repository at this point in the history

  4. feat(glean): fixing reference to old attribute names

    Braun committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    28ebd4e View commit details
    Browse the repository at this point in the history

  5. feat(glean): adding new helper code

    Braun committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    1686884 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Merge tag 'v4.2.0' files without conflict

    @toufali
    toufali committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    4d6c9eb View commit details
    Browse the repository at this point in the history

  2. Merge v4.2.0 files resolving conflict with theirs

    @toufali
    toufali committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    8b88f45 View commit details
    Browse the repository at this point in the history

  3. Merge v4.2.0 files resolving conflict with ours

    @toufali
    toufali committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    ecf4540 View commit details
    Browse the repository at this point in the history

  4. Merge v4.2.0 conflict file tentatively with theirs

    @toufali
    toufali committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    6002725 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge pull request from GHSA-2693-xr3m-jhqr

    @ClearlyClaire @aaga
    ClearlyClaire authored and aaga committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    398dfe4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request from GHSA-v3xf-c9qf-j667

    @ClearlyClaire @aaga
    ClearlyClaire authored and aaga committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    27049e8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #44 from MozillaSocial/merge-4.2.0-security-only 

    Merge 4.2.0 security only
    @aaga
    aaga authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    007dfb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. chore(copy): [SOCIALPLAT-711] update Language in the Terms of Service… 

    …, Privacy Policy and other legal documents
    @nina-py
    nina-py committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    199f1e6 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Update copy to approved wording

    @nina-py
    nina-py committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    614e242 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Updated date to when the changes are going to be unveiled officially

    @nina-py
    nina-py committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    ad1b81f View commit details
    Browse the repository at this point in the history

  2. Add OIDC back in

    @nina-py
    nina-py committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    005b06b View commit details
    Browse the repository at this point in the history

  3. refactor(glean): refactoring glean server side implementation

    Braun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    f2eb3c7 View commit details
    Browse the repository at this point in the history

  4. refactor(glean): fixing domain if clause

    Braun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    0559faa View commit details
    Browse the repository at this point in the history

  5. refactor(glean): fixing missing comma

    Braun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    12d6aea View commit details
    Browse the repository at this point in the history

  6. refactor(glean): moving glean to the initializers section

    Braun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    da886eb View commit details
    Browse the repository at this point in the history

  7. refactor(glean): trying to get global controller logger working

    Braun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    a6955c9 View commit details
    Browse the repository at this point in the history

  8. refactor(glean): moving the glean logger outside of application contr… 

    …oller class
    Braun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    2577335 View commit details
    Browse the repository at this point in the history

  9. refactor(glean): fixing how handle is handled :)

    Braun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    ad718cc View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Update wording around account deletion

    @nina-py
    nina-py committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    2764226 View commit details
    Browse the repository at this point in the history

  2. feat(glean): new logging module

    Braun committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    4d65a88 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. feat(glean): adding a newer version of the glean logger

    Braun committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    6a2ad8c View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Revert "Add OIDC back in" 

    This reverts commit 005b06b.
    @toufali
    toufali committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    cc57b11 View commit details
    Browse the repository at this point in the history

  2. Fix SSO redirect

    @toufali
    toufali committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    5016464 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. feat(glean): applying rubocop changes, moved the instantiation inside… 

    … of class per rubocop, update the handle and domain logic
    Braun committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    1b4b075 View commit details
    Browse the repository at this point in the history

  2. feat(glean): removing unneeded OS module

    Braun committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    c3a492d View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Merge pull request #42 from MozillaSocial/merge-v4.2.0 

    Merge v4.2.0
    @toufali
    toufali authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    a696121 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. feat(glean): updated notification email

    Braun committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    9654047 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #36 from MozillaSocial/feature/glean-server-side 

    feat(glean):adding proper glean formatted JSON logs to be used for behaviorial analytics in Big Query
    @kschelonka
    kschelonka authored Oct 27, 2023
    Configuration menu
    Copy the full SHA
    106775a View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Merge pull request #45 from MozillaSocial/SOCIALPLAT-711-update-ff-ac… 

    …count-copy-in-legal-docs

chore(copy): [SOCIALPLAT-711] update Language in the Terms of Service, Privacy Policy and other legal documents
    @aaga
    aaga authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    91d6945 View commit details
    Browse the repository at this point in the history

  2. Revert "feat(glean):adding proper glean formatted JSON logs to be use… 

    …d for behaviorial analytics in Big Query"
    @toufali
    toufali authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    cd5c694 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #48 from MozillaSocial/revert-36-feature/glean-ser… 

    …ver-side

Revert "feat(glean):adding proper glean formatted JSON logs to be use…
    @toufali
    toufali authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    87ace54 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #49 from MozillaSocial/patch-v4.2.0-mozilla-social-30 

    Revert #36 - "feat(glean):adding proper glean formatted JSON logs..."
    @toufali
    toufali authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    e4f58f0 View commit details
    Browse the repository at this point in the history

  5. Revert "Revert "feat(glean):adding proper glean formatted JSON logs t… 

    …o be use…"
    @toufali
    toufali authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    7d59565 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Merge pull request #50 from MozillaSocial/feature/glean-server-side-2 

    feat(glean):adding proper glean formatted JSON logs…
    @toufali
    toufali authored Nov 1, 2023
    Configuration menu
    Copy the full SHA
    9255beb View commit details
    Browse the repository at this point in the history

  2. Merge tag 'v4.2.1' into merge-v4.2.1

    @toufali
    toufali committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    183866b View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Merge pull request #51 from MozillaSocial/merge-v4.2.1 

    Merge Mastodon release v4.2.1 into `main`
    @toufali
    toufali authored Nov 2, 2023
    Configuration menu
    Copy the full SHA
    389762c View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Update Glean app_id 

    We need to update app_id in order to ingest this telemetry.
This is a follow up to https://github.com/mozilla/probe-scraper/pull/654/files#r1383941143.
    @akkomar
    akkomar authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    2fbc592 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Merge pull request #53 from akkomar/patch-1 

    Update Glean app_id
    @toufali
    toufali authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    3e5a2d9 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. feat(trust&safety): [SOCIALPLAT-766] Remove media when status is deleted 

    Immediately remove public copy of media when status is deleted.

- Updated `destroy` method in StatusesController
- Updated unit tests

JIRA reference: https://mozilla-hub.atlassian.net/browse/SOCIALPLAT-766
    @nina-py
    nina-py committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    e7fd119 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Refactor media deletion code into a Worker

    @nina-py
    nina-py committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    93250ea View commit details
    Browse the repository at this point in the history

  2. Add unit tests for MediaAttachmentDeletionWorker

    @nina-py
    nina-py committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    3111e59 View commit details
    Browse the repository at this point in the history

  3. Deleting media attachments in status batch actions, too

    @nina-py
    nina-py committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    09bfd22 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge pull request #54 from MozillaSocial/SOCIALPLAT-766-immediately-… 

    …remove-public-copy-of-media

feat(trust & safety): [SOCIALPLAT-766] Immediately remove public copy of media when status is deleted

- Set up a new MediaAttachmentDeletionWorker to delete media.
- Add unit tests for MediaAttachmentDeletionWorker.
- Use the new worker in the two spots it's needed in status controllers.
- Update unit tests for status controllers to check for media deletion. 

JIRA reference: https://mozilla-hub.atlassian.net/browse/SOCTRUST-31
    @nina-py
    nina-py authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    d0e1834 View commit details
    Browse the repository at this point in the history

  2. Merge tag 'v4.2.3' into merge-4.2.3

    @nina-py
    nina-py committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    91489f6 View commit details
    Browse the repository at this point in the history

  3. Fix CodeQL errors

    @nina-py
    nina-py committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    73d712a View commit details
    Browse the repository at this point in the history

  4. Fix linting errors

    @nina-py
    nina-py committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    e04a2c9 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Merge pull request #56 from MozillaSocial/merge-4.2.3 

    chore(sync fork): [SOCPLAT-34] Merge Mastodon v4.2.3
    @nina-py
    nina-py authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    14cf72a View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. build(glean): adding the probe scrapper gha as required by Glean 

    https://mozilla.github.io/glean/book/user/adding-glean-to-your-project/enable-data-ingestion.html#add-your-product-to-probe-scraper
    Braun committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    7256d92 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Merge pull request #57 from MozillaSocial/feature/SOCIALPLAT-478-prob… 

    …e-scraper-gha

build(glean): adding the probe scrapper gha as required by Glean
    @toufali
    toufali authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    cce663e View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. chore(monitoring): [SOCPLAT-32] Add Sentry monitoring to project 

    - Added `sentry-ruby` and `sentry-rails` gems
- Added a Sentry initialisation script with our Sentry DSN
for this repository.

JIRA Reference: https://mozilla-hub.atlassian.net/browse/SOCPLAT-32
    @nina-py
    nina-py committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    ba73a3f View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Merge pull request #58 from MozillaSocial/socialplat-32-set-up-sentry 

    chore(monitoring): [SOCPLAT-32] Add Sentry monitoring to project
    @nina-py
    nina-py authored Jan 30, 2024
    Configuration menu
    Copy the full SHA
    c9bbfd5 View commit details
    Browse the repository at this point in the history

  2. Merge tag 'v4.2.4' into merge-v4.2.4

    @nina-py
    nina-py committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    aae8870 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Merge pull request #59 from MozillaSocial/merge-v4.2.4 

    chore(updates): Merge Mastodon v4.2.4
    @toufali
    toufali authored Feb 1, 2024
    Configuration menu
    Copy the full SHA
    8a886dc View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. Merge tag 'v4.2.5' into merge-v4.2.5

    @toufali
    toufali committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    27804b9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #60 from MozillaSocial/merge-v4.2.5 

    Merge v4.2.5
    @toufali
    toufali authored Feb 2, 2024
    Configuration menu
    Copy the full SHA
    ab7baf4 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Merge tag 'v4.2.6' into merge-v4.2.6

    @toufali
    toufali committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    60e0213 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #61 from MozillaSocial/merge-v4.2.6 

    Merge v4.2.6
    @bakulf
    bakulf authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    120d417 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Merge tag 'v4.2.7' into merge-v4.2.7

    @toufali
    toufali committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    ed16de9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #62 from MozillaSocial/merge-v4.2.7 

    Merge v4.2.7
    @toufali
    toufali authored Feb 16, 2024
    Configuration menu
    Copy the full SHA
    528b24e View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Delete attachment async when the admin status API is triggered

    @bakulf
    bakulf committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    3f57696 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #63 from MozillaSocial/fixDelete 

    Delete attachment async when the admin status API is triggered
    @bakulf
    bakulf authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    63a5f52 View commit details
    Browse the repository at this point in the history

  3. differentiate envs for better Sentry logging

    @toufali
    toufali committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    1ca8190 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Delete attachment async when the admin status API is triggered - comm… 

    …ent applied
    @bakulf
    bakulf committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    7794e96 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #64 from MozillaSocial/sentry-differentiate-env 

    differentiate envs for better Sentry logging
    @toufali
    toufali authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    4092bb4 View commit details
    Browse the repository at this point in the history

  3. Merge tag 'v4.2.8' into merge-v4.2.8

    @toufali
    toufali committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    ba38045 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #67 from MozillaSocial/merge-v4.2.8 

    Merge v4.2.8
    @toufali
    toufali authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    8d07a54 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #66 from MozillaSocial/followUp 

    Delete attachment async when the admin status API is triggered - comm…
    @bakulf
    bakulf authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    50bc576 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. revert code format diffs

    @toufali
    toufali committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    e759917 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. revert changes to sign-in flow

    @toufali
    toufali committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    27cae40 View commit details
    Browse the repository at this point in the history

  2. revert changes to sign-out

    @toufali
    toufali committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    4d68c43 View commit details
    Browse the repository at this point in the history

  3. revert superapp/client auto-approval changes

    @toufali
    toufali committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    762e19a View commit details
    Browse the repository at this point in the history

  4. revert various minor changes

    @toufali
    toufali committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    cbb3024 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. add comment describing change from upstream

    @toufali
    toufali committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    c9c611d View commit details
    Browse the repository at this point in the history