276954bfd0
th: sure. why not. let's interpolate DB_HOST.
1 year ago
e60d9bed75
th: maybe this was a good idea after all
1 year ago
b24d7bb6f2
th: Merge remote-tracking branch 'glitch/main' ( 18eacc7a07)
1 year ago
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.
1 year ago
1288d4c9b6
th: Merge remote-tracking branch 'glitch/main' ( 5efa6ac771)
1 year ago
18eacc7a07
Merge pull request #2447 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 126cd7705d
1 year ago
5d9df170cf
[Glitch] Do not display the navigation banner in the logo container
...
Port 126cd7705d
1 year ago
cc000c8859
Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream
1 year ago
1c53aec00e
Merge pull request #2446 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 9f218c9924
1 year ago
1a3248dc90
[Glitch] Consider shown and pending status in explore prompt calculation
...
Port f76e5111f0
1 year ago
41f58e945c
[Glitch] The `class` props should be `className`
...
Port 10df97c542
1 year ago
126cd7705d
Do not display the navigation banner in the logo container ( #27476 )
1 year ago
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
1 year ago
918137babc
Merge pull request #2444 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 5ef26d8fd5
1 year ago
68401fc426
[Glitch] Support "in:public" search filter
...
Port ad44d832b8
1 year ago
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
1 year ago
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
1 year ago
7bc8f03162
Add test coverage for `Mastodon::CLI::Accounts#migrate` ( #25284 )
1 year ago
1ffd5a98a9
New Crowdin Translations (automated) ( #27465 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
f76e5111f0
Consider shown and pending status in explore prompt calculation ( #27466 )
...
Co-authored-by: Brian Campbell <brcampbell@beta.team>
1 year ago
10df97c542
The `class` props should be `className` ( #27462 )
1 year ago
510845b6b9
Only enable github-rspec for pull_request events ( #27456 )
1 year ago
a1b27d8b61
Fix `Naming/VariableNumber` cop ( #27447 )
1 year ago
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
1 year ago
4612576c68
New Crowdin Translations (automated) ( #27454 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
63a2a4b074
Fix `Performance/DeletePrefix` cop ( #27448 )
1 year ago
091a21e1bc
Add test coverage for `Mastodon::CLI::Accounts#prune` ( #25204 )
1 year ago
e9dc30cdba
Fix duplicate github annotations for rspec failures ( #27450 )
1 year ago
0d18c47c18
Enable scheduled actions only on glitch-soc's repo
1 year ago
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
1 year ago
8bbbd012d4
[Glitch] Fix missing redirections to make sure /home redirect to the advanced UI
...
Port 935d54124e
1 year ago
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
1 year ago
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`.
1 year ago
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.
1 year ago
5ef26d8fd5
Add RSpec GitHub annotations gem ( #24040 )
1 year ago
71447ab19f
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features/admin area ( #27445 )
1 year ago
0036de46bc
Update dependency rubocop-performance to v1.19.1 ( #26949 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
ad44d832b8
Support "in:public" search filter ( #26976 )
1 year ago
2528a0721f
Update `rubocop-capybara` to version 2.19.0 ( #26982 )
1 year ago
1996fb6fd6
Update dependency puma to v6.4.0 ( #27006 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
65cd0700e4
Refactor domains cli to remove model call from regex ( #25878 )
1 year ago
b34a2b1b33
Fix errors in CLI specs ( #27399 )
1 year ago
c0cda1adaf
Let use http_hidden_proxy on docker-compose ( #27054 )
1 year ago
1fb4e40145
Run scheduled actions only on the main repo ( #27343 )
1 year ago
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
1 year ago
c4bddc9855
Add spec for poll model ( #23399 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
12bb7be8b5
Spec speed ups on `AccountsController` spec ( #25391 )
1 year ago
d54fec24e5
Add coverage for `CLI::PreviewCards#remove` command ( #27441 )
1 year ago
19900f647e
Add coverage for `UnreservedUsernameValidator` ( #25590 )
1 year ago
1084703417
Update changelog ( #27440 )
1 year ago
Kouhai
kouhai
Claire
Renaud Chaput
Brian Campbell
Jeong Arm
Matt Jankowski
Daniel M Brasil
github-actions[bot]
Emelia Smith
Stanislas Signoud
Nick Schonning
renovate[bot]
Victor Lee