Jeremy Kescher
0e634397c3
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
2023-02-21 00:40:08 +01:00
Claire
45087c1092
Merge pull request #2117 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-02-20 22:41:20 +01:00
Claire
dc0cc5a57d
Fix incorrect translation string in glitch-soc captcha feature
2023-02-19 11:02:27 +01:00
Claire
8c8358b3cf
[Glitch] Fix focus point of already-attached media not saving after edit
...
Port b2283b6838
2023-02-19 10:54:04 +01:00
Christian Schmidt
229ab559dc
[Glitch] Fix bad type for spellCheck attribute
...
Port cde13349cb
2023-02-19 10:53:44 +01:00
Nick Schonning
6fdd596cc8
[Glitch] Enable ESLint Promise plugin defaults
...
Port 5e1c0c3d94
2023-02-19 10:53:18 +01:00
Claire
7452a95998
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes while we have dropped this file.
Keep the file deleted.
- `.prettierignore`:
Upstream made changes at the end of the file, where we
had our extra lines.
Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
Upstream code style changes.
Applied them.
- `app/services/backup_service.rb`:
Upstream code style changes.
Applied them.
2023-02-19 10:42:55 +01:00
AcesFullOfKings
fef6c59b3a
Grammar fix ( #23634 )
2023-02-19 07:12:32 +01:00
Claire
b2283b6838
Fix focus point of already-attached media not saving after edit ( #23566 )
2023-02-19 07:11:18 +01:00
Nick Schonning
1d9ed91643
Move db migration CI to GitHub Actions ( #23624 )
2023-02-19 07:06:34 +01:00
Yamagishi Kazutoshi
77779ddebc
Fix devcontainer.json format ( #23715 )
2023-02-19 07:02:46 +01:00
Nick Schonning
e0e63b73ee
Autofix Rubocop RSpec/EmptyLineAfterHook ( #23718 )
2023-02-19 14:54:34 +09:00
Nick Schonning
81ad6c2e39
Autofix Rubocop Style/StringLiterals ( #23695 )
2023-02-19 07:38:14 +09:00
Nick Schonning
ac3561098e
Autofix Rubocop RSpec/LetBeforeExamples ( #23671 )
2023-02-19 07:17:59 +09:00
Nick Schonning
1a02101100
Autofix Rubocop Style/EmptyLambdaParameter ( #23705 )
2023-02-19 07:12:06 +09:00
Nick Schonning
3680e032b4
Autofix Rubocop RSpec/EmptyLineAfterFinalLet ( #23707 )
2023-02-19 07:10:19 +09:00
Nick Schonning
2177daeae9
Autofix Rubocop Style/RedundantBegin ( #23703 )
2023-02-19 07:09:40 +09:00
Nick Schonning
167709f6b0
Autofix Rubocop Style/BlockDelimiters ( #23706 )
2023-02-19 07:00:17 +09:00
Nick Schonning
c0d7c855b3
Autofix Rubocop RSpec/Capybara/FeatureMethods ( #23708 )
2023-02-19 06:59:00 +09:00
Nick Schonning
08289a38fa
Autofix Rubocop Style/TrailingCommaInArrayLiteral ( #23692 )
2023-02-19 06:54:30 +09:00
Jeremy Kescher
4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile
# Gemfile.lock
# config/sidekiq.yml
2023-02-18 22:38:53 +01:00
Claire
4c68189d2b
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-02-18 22:05:11 +01:00
Nick Schonning
ea9a1d79df
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 0c9d455ea5
2023-02-18 16:02:12 +01:00
Nick Schonning
7e64eef73b
[Glitch] Enable ESLint no-useless-escape
...
Port db2c58d47a
2023-02-18 16:02:12 +01:00
Claire
587f6b3b06
[Glitch] Enable ESLint import recommended rules
...
Port eddfb33dfe
2023-02-18 16:02:12 +01:00
Nick Schonning
5069769cbe
Autofix Rubocop Style/TrailingCommaInHashLiteral ( #23693 )
2023-02-18 23:33:41 +09:00
Nick Schonning
de4b8224c0
Run bundler-audit on PRs ( #23514 )
2023-02-18 12:49:09 +01:00
Nick Schonning
b4cbfff3eb
Autofix Rubocop RSpec/ExcessiveDocstringSpacing ( #23666 )
2023-02-18 12:47:37 +01:00
Nick Schonning
7e215b3bda
Check for missing i18n strings in CI ( #23368 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-02-18 12:46:44 +01:00
Nick Schonning
b4df632ca1
Run prettier on full repo with ignored extensions ( #23538 )
2023-02-18 12:44:45 +01:00
Nick Schonning
c38bd17657
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2023-02-18 12:39:58 +01:00
Nick Schonning
ab7816a414
Autofix Rubocop Style/Lambda ( #23696 )
2023-02-18 12:39:00 +01:00
Nick Schonning
e2a3ebb271
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2023-02-18 12:37:47 +01:00
Claire
2be88d1930
New Crowdin updates ( #2111 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* Fix root key name in pt-PT translation file
* Fix normalization issue with ES translation
* Fix issue with `no` locale in glitch-soc
2023-02-18 11:16:30 +01:00
Nick Schonning
9ab2a775c9
Set CI concurrency at the job level ( #23689 )
2023-02-18 14:56:16 +09:00
dependabot[bot]
49b9ef0c1e
Bump oj from 3.13.23 to 3.14.2 ( #23560 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-18 14:21:10 +09:00
Nick Schonning
8aee4de034
Autofix Rubocop Style/PerlBackrefs ( #23649 )
2023-02-18 14:20:20 +09:00
Nick Schonning
a6f77aa28a
Autofix Rubocop Lint/AmbiguousOperatorPrecedence ( #23681 )
2023-02-18 04:30:23 +01:00
Nick Schonning
e2567df860
Enable Lint/RedundantCopDisableDirective ( #23687 )
2023-02-18 04:30:14 +01:00
Nick Schonning
d65b2c1924
Apply Rubocop Style/RedundantConstantBase ( #23463 )
2023-02-18 04:30:03 +01:00
Nick Schonning
e4f37fad98
Only run latest for PR Rebase job ( #23688 )
2023-02-18 04:25:31 +01:00
Nick Schonning
a7db0b41cd
Autofix Rubocop Lint/ParenthesesAsGroupedExpression ( #23682 )
2023-02-18 04:00:05 +01:00
Nick Schonning
e5cf23cf3a
Enable Rubocop RSpec/HooksBeforeExamples ( #23668 )
2023-02-18 03:59:57 +01:00
Nick Schonning
efd424506a
Autofix Rubocop Style/RedundantPercentQ ( #23651 )
2023-02-18 03:32:57 +01:00
Nick Schonning
7a941b42d3
Remove Style/Copyright Rubocop ( #23665 )
2023-02-18 03:26:41 +01:00
Nick Schonning
c0a645f647
Autofix Rubocop RSpec/ExampleWording ( #23667 )
2023-02-18 03:26:20 +01:00
Nick Schonning
7a3d4c3d4b
Enable Rubocop RSpec/MultipleDescribes ( #23672 )
2023-02-18 03:25:47 +01:00
Nick Schonning
54318dcd6d
Autofix Rubocop RSpec/ClassCheck ( #23685 )
2023-02-18 03:24:16 +01:00
Nick Schonning
634368c491
Autofix Rubocop Lint/SymbolConversion ( #23683 )
2023-02-18 03:23:49 +01:00
Nick Schonning
6d42820e5d
Autofix Rubocop Lint/AmbiguousOperator ( #23680 )
2023-02-18 03:22:01 +01:00
