Commit graph

Select branches

Hide pull requests

develop

main

merge/filtering

patches/emoji-reactions-main

stable/4.3

4.0.1+1.0.0

4.0.1+1.0.1

4.0.1+1.0.2

4.0.1+1.0.3

4.0.1+1.0.4

v3.5.3+1.0.0

v3.5.3+1.0.1

v3.5.3+1.0.3

v3.5.3+1.0.4

v3.5.3+1.0.5

v3.5.3+1.0.6

v3.5.3+1.0.7

v3.5.3+1.0.8

v3.5.3+1.0.9

v3.5.3+1.1.0

v3.5.3+1.1.1

v3.5.3+1.1.2

v3.5.3+1.1.3

v3.5.3+1.1.4

v3.5.3+1.1.5

v3.5.3+1.1.6

v3.5.3+1.2.1

v3.5.3+1.2.2

v3.5.3+1.2.3

v4.0.0+1.0.0

v4.0.2+1.0.0

v4.0.2+1.0.1

v4.0.2+1.0.10

v4.0.2+1.0.11

v4.0.2+1.0.12

v4.0.2+1.0.13

v4.0.2+1.0.2

v4.0.2+1.0.3

v4.0.2+1.0.4

v4.0.2+1.0.5

v4.0.2+1.0.6

v4.0.2+1.0.7

v4.0.2+1.0.8

v4.0.2+1.0.9

v4.0.2+1.1.0

v4.0.2+1.1.1

v4.0.2+1.1.2

v4.0.2+1.1.3

v4.0.2+1.1.4

v4.0.2+1.1.5

v4.0.2+1.1.6

v4.0.2+1.1.7

v4.0.2+1.1.8

v4.0.2+1.1.9

v4.1.0+1.0.0

v4.1.0+1.0.1

v4.1.0+2.0.0

v4.1.0+2.0.1

v4.1.0+2.0.2

v4.1.0+2.0.4

v4.1.0+2.0.5

v4.1.0+2.1.0

v4.1.0+2.1.1

v4.1.1+1.0.0

v4.1.1+1.0.1

v4.1.1+1.0.2

v4.1.1+1.0.3

v4.1.1+1.0.4

v4.1.1+1.0.5

v4.1.1+1.0.6

v4.1.1+1.0.7

v4.1.2+1.0.0

v4.1.2+1.0.1

v4.1.2+1.0.2

v4.1.2+1.0.3

v4.1.2+1.0.4

v4.1.2+1.1.0

v4.1.2+1.1.1

v4.1.2+1.1.2

v4.1.2+1.1.3

v4.1.2+1.1.4

v4.1.3+1.0.0

v4.1.4+1.0.0

v4.3.0+1.0.0

v4.3.0+1.0.1

v4.3.0+cat.1.0.1

v4.3.0+cat.1.0.2

v4.3.0-alpha.0+glitch+cat+1.0.10

v4.3.0-alpha.0+glitch+cat+1.0.11

v4.3.0-alpha.0+glitch+cat+1.0.12

v4.3.0-alpha.0+glitch+cat+1.0.13

v4.3.0-alpha.0+glitch+cat+1.0.14

v4.3.0-alpha.0+glitch+cat+1.0.2

v4.3.0-alpha.0+glitch+cat+1.0.3

v4.3.0-alpha.0+glitch+cat+1.0.4

v4.3.0-alpha.0+glitch+cat+1.0.5

v4.3.0-alpha.0+glitch+cat+1.0.6

v4.3.0-alpha.0+glitch+cat+1.0.7

v4.3.0-alpha.0+glitch+cat+1.0.8

v4.3.0-alpha.0+glitch+cat+1.0.9

v4.3.0-alpha.1+glitch+cat+1.0.15

v4.3.0-alpha.1+glitch+cat+1.0.16

v4.3.0-alpha.1+glitch+cat+1.0.17

v4.3.0-alpha.2+glitch+cat+1.0.18

v4.3.0-alpha.3+glitch+cat+1.0.0

v4.3.0-alpha.3+glitch+cat+1.0.1

v4.3.0-alpha.3+glitch+cat+1.0.2

v4.3.0-alpha.3+glitch+cat+1.0.3

v4.3.0-alpha.3+glitch+cat+1.0.4

v4.3.0-alpha.3+glitch+cat+1.0.5

v4.3.0-alpha.3+glitch+cat+1.0.6

v4.3.0-alpha.3+glitch+cat+1.0.7

v4.3.0-alpha.3+glitch+cat+1.0.8

v4.3.0-alpha.3+glitch+cat+1.0.9

v4.3.0-alpha.3+glitch+cat+1.1.0

v4.3.0-alpha.3+glitch+cat+1.1.1

v4.3.0-alpha.3+glitch+cat+1.1.2

v4.3.0-alpha.3+glitch+cat+1.1.3

v4.3.0-alpha.3+glitch+cat+1.2.0

v4.3.0-alpha.3+glitch+cat+1.2.1

v4.3.0-alpha.3+glitch+cat+1.2.2

v4.3.0-alpha.3+glitch+cat+1.2.3

v4.3.0-alpha.3+glitch+cat+1.2.4

v4.3.0-alpha.3+glitch+cat+1.2.5

v4.3.0-alpha.3+glitch+cat+1.2.6

v4.3.0-alpha.4+glitch+cat+1.0.0

v4.3.0-alpha.4+glitch+cat+1.0.1

v4.3.0-alpha.4+glitch+cat+1.0.2

v4.3.0-alpha.4+glitch+cat+1.0.3

v4.3.0-alpha.4+glitch+cat+1.1.0

v4.3.0-alpha.4+glitch+cat+1.1.1

v4.3.0-alpha.4+glitch+cat+1.1.2

v4.3.0-alpha.4+glitch+cat+1.1.3

v4.3.0-alpha.5+glitch+cat+1.0.0

v4.3.0-alpha.5+glitch+cat+1.0.1

v4.3.0-alpha.5+glitch+cat+1.0.10

v4.3.0-alpha.5+glitch+cat+1.0.2

v4.3.0-alpha.5+glitch+cat+1.0.3

v4.3.0-alpha.5+glitch+cat+1.0.4

v4.3.0-alpha.5+glitch+cat+1.0.5

v4.3.0-alpha.5+glitch+cat+1.0.6

v4.3.0-alpha.5+glitch+cat+1.0.7

v4.3.0-alpha.5+glitch+cat+1.0.8

v4.3.0-alpha.5+glitch+cat+1.0.9

v4.3.0-beta.1+cat.1.0.0

v4.3.0-beta.2+cat.1.0.0

v4.3.0-beta.2+cat.1.0.1

v4.3.0-rc.1+cat.1.0.0

v4.3.0-rc.1+cat.1.0.1

v4.3.1+cat.1.0.0

v4.3.1+cat.1.0.1

v4.3.1+cat.1.0.2

v4.3.2+cat.1.0.0

v4.3.2+cat.1.0.1

v4.3.3+cat.1.0.0

v4.3.3+cat.1.0.1

v4.3.3+cat.1.0.2

Mono Color

• 6bd7003799
  Fix mispelled spec filenames (#23834) Nick Schonning 2023-02-23 05:28:56 -05:00
• 2564117131
  New Crowdin updates (#23625) Eugen Rochko 2023-02-22 13:16:02 +01:00
• f682478de8
  Fix inefficiency when searching accounts per username in admin interface (#23801) Claire 2023-02-22 11:53:13 +01:00
• 3ed1b9ebb6
  Fix rack:attack flaky tests and test end of throttle period (#23799) Claire 2023-02-22 10:28:52 +01:00
• 4ff44be134
  Autofix Rubocop Rails/Blank (#23765) Nick Schonning 2023-02-21 19:57:56 -05:00
• 8fd3fc404d
  Autofix Rubocop Rails/RootPathnameMethods (#23760) Nick Schonning 2023-02-21 19:57:15 -05:00
• 48aeab90f6
  Ignore JSX files from Prettier (#23777) Nick Schonning 2023-02-21 19:56:11 -05:00
• 84cc805cae
  Enable Style/FrozenStringLiteralComment for specs (#23790) Nick Schonning 2023-02-21 19:55:31 -05:00
• 0cfdd1a401
  Enable Rubocop Style/StringConcatenation defaults (#23792) Nick Schonning 2023-02-21 19:54:36 -05:00
• 7ecf783dd3
  Bump @babel/plugin-proposal-decorators from 7.20.13 to 7.21.0 (#23769) dependabot[bot] 2023-02-21 11:35:27 +01:00
• 9d8349f0c4
  Bump @babel/plugin-transform-react-inline-elements from 7.18.6 to 7.21.0 (#23766) dependabot[bot] 2023-02-21 11:14:25 +01:00
• 24d265d604
  Bump @babel/plugin-transform-runtime from 7.19.6 to 7.21.0 (#23774) dependabot[bot] 2023-02-21 10:59:58 +01:00
• a573641b15
  Bump @babel/core from 7.20.12 to 7.21.0 (#23767) dependabot[bot] 2023-02-21 10:46:03 +01:00
• 92a0afda28
  Bump @babel/runtime from 7.20.13 to 7.21.0 (#23773) dependabot[bot] 2023-02-21 10:44:51 +01:00
• 4b964fa605
  Bump devise from 4.8.1 to 4.9.0 (#23691) dependabot[bot] 2023-02-21 10:41:28 +01:00
• 7adde24a95
  Fix sidebar cut-off on small screens in admin UI (#23764) Botao Wang 2023-02-21 18:06:13 +09:00
• 513316f768
  Bump stylelint from 15.1.0 to 15.2.0 (#23770) dependabot[bot] 2023-02-21 09:41:28 +01:00
• 57b83ce337
  Bump blurhash from 2.0.4 to 2.0.5 (#23771) dependabot[bot] 2023-02-21 09:33:30 +01:00
• d58400d00c
  Bump sass from 1.58.2 to 1.58.3 (#23772) dependabot[bot] 2023-02-21 09:30:59 +01:00
• fbbf5c4841
  Bump capistrano from 3.17.1 to 3.17.2 (#23775) dependabot[bot] 2023-02-21 09:29:07 +01:00
• 7207a98d39
  Add lang tag to native language names in language picker (#23749) Claire 2023-02-21 09:23:39 +01:00
• 434770f580
  Autofix Rubocop Rails/FindById (#23762) Nick Schonning 2023-02-20 20:21:48 -05:00
• 88d22463d9
  
  Merge remote-tracking branch 'upstream/main' into develop v4.1.0+2.0.0 Jeremy Kescher 2023-02-21 00:53:40 +01:00
• 0e634397c3
  
  Merge remote-tracking branch 'upstream/main' into develop Jeremy Kescher 2023-02-21 00:40:08 +01:00
• 45087c1092
  Merge pull request #2117 from ClearlyClaire/glitch-soc/merge-upstream Claire 2023-02-20 22:41:20 +01:00
• 35d032500b
  Autofix Rubocop Security/IoMethods (#23757) Nick Schonning 2023-02-20 13:21:19 -05:00
• 9909b4b653
  Autofix Rubocop Rails/WhereEquals (#23759) Nick Schonning 2023-02-20 13:20:56 -05:00
• d3b4d4d4f3
  Change compose form checkbox to native input with appearance: none (#22949) Claire 2023-02-20 11:32:27 +01:00
• b65ca7acc9
  Update rebase needed job settings (#23746) Nick Schonning 2023-02-20 05:02:06 -05:00
• 59c8d43d94
  Autofix Rubocop Style/RescueStandardError (#23745) Nick Schonning 2023-02-20 05:01:20 -05:00
• 62c4aecf8f
  Make larger part of status clickable (#23621) Christian Schmidt 2023-02-20 08:11:23 +01:00
• 2c3c734bcc
  Autofix Rubocop Style/SymbolProc (#23742) Nick Schonning 2023-02-20 01:58:46 -05:00
• af4c95100c
  Autofix Rubocop Style/FormatString (#23743) Nick Schonning 2023-02-20 01:58:33 -05:00
• a9472f8ff1
  Fix Markdown files with Prettier and check in CI (#21972) Nick Schonning 2023-02-20 01:37:28 -05:00
• 717683d1c3
  Autofix Rubocop remaining Layout rules (#23679) Nick Schonning 2023-02-20 00:58:28 -05:00
• d2dcb6c45a
  Autofix Rubocop Style/UnpackFirst (#23741) Nick Schonning 2023-02-20 00:51:43 -05:00
• 5116347eb7
  Autofix Rubocop RSpec/BeEq (#23740) Nick Schonning 2023-02-20 00:14:50 -05:00
• bf785df9fe
  Audofix Rubocop Style/WordArray (#23739) Nick Schonning 2023-02-20 00:14:10 -05:00
• 4552685f6b
  Autofix Rubocop RSpec/LeadingSubject (#23670) Nick Schonning 2023-02-19 23:24:14 -05:00
• 4ea1e0fceb
  Enable Rubocop RSpec/ExpectActual (#23720) Nick Schonning 2023-02-19 23:00:59 -05:00
• 38a1d8bb85
  Autofix Rubocop RSpec/ImplicitSubject (#23721) Nick Schonning 2023-02-19 23:00:48 -05:00
• 63e6353886
  Autofix Rubocop Rails/EnumHash (#23737) Nick Schonning 2023-02-19 23:00:36 -05:00
• 44a7d87cb1
  Rename JSX files with proper .jsx extension (#23733) Renaud Chaput 2023-02-20 03:20:59 +01:00
• f0e1b12c10
  Autofix Rubocop Style/ExplicitBlockArgument (#23704) Nick Schonning 2023-02-19 21:18:08 -05:00
• 5179c47087
  Autofix Rubocops RSpec/ScatteredLet (#23725) Nick Schonning 2023-02-19 21:17:41 -05:00
• aef0051fd0
  Enable Rubocop HTTP status rules (#23717) Nick Schonning 2023-02-19 21:16:40 -05:00
• bd1d57c230
  Autofix Rubocop RSpec/EmptyLineAfterSubject (#23719) Nick Schonning 2023-02-19 20:46:00 -05:00
• dbc6d7b276
  Autofix Rubocop Lint/UnusedBlockArgument (#23712) Nick Schonning 2023-02-19 20:45:50 -05:00
• 65ba0d92ef
  Enable Rubocop RSpec/NotToNot (#23723) Nick Schonning 2023-02-19 20:33:27 -05:00
• a2fdb388eb
  Autofix Rubocop RSpec/ReturnFromStub (#23724) Nick Schonning 2023-02-19 20:32:10 -05:00
• 21bf326356
  Autofix Rubocop Rails/Pluck (#23730) Nick Schonning 2023-02-19 20:28:40 -05:00
• 597767a9f7
  Autofix Rubocop Rails/RedundantForeignKey (#23731) Nick Schonning 2023-02-19 20:19:40 -05:00
• 8ef09813a2
  Autofix Rubocop Style/EmptyMethod (#23732) Nick Schonning 2023-02-19 20:18:54 -05:00
• dc0cc5a57d Fix incorrect translation string in glitch-soc captcha feature Claire 2023-02-19 11:02:27 +01:00
• 8c8358b3cf [Glitch] Fix focus point of already-attached media not saving after edit Claire 2023-02-19 07:11:18 +01:00
• 229ab559dc [Glitch] Fix bad type for spellCheck attribute Christian Schmidt 2023-02-17 09:51:27 +01:00
• 6fdd596cc8 [Glitch] Enable ESLint Promise plugin defaults Nick Schonning 2023-02-16 01:30:56 -05:00
• 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream Claire 2023-02-19 10:42:55 +01:00
• fc3c4a5aaf Revert use of specific git repo for kt-paperclip; it seems to be causing 500 errors neatchee 2023-02-18 22:31:00 -08:00
• fef6c59b3a
  Grammar fix (#23634) AcesFullOfKings 2023-02-19 06:12:32 +00:00
• b2283b6838
  Fix focus point of already-attached media not saving after edit (#23566) Claire 2023-02-19 07:11:18 +01:00
• 1d9ed91643
  Move db migration CI to GitHub Actions (#23624) Nick Schonning 2023-02-19 01:06:34 -05:00
• 77779ddebc
  Fix devcontainer.json format (#23715) Yamagishi Kazutoshi 2023-02-19 15:02:46 +09:00
• e0e63b73ee
  Autofix Rubocop RSpec/EmptyLineAfterHook (#23718) Nick Schonning 2023-02-19 00:54:34 -05:00
• 81ad6c2e39
  Autofix Rubocop Style/StringLiterals (#23695) Nick Schonning 2023-02-18 17:38:14 -05:00
• ac3561098e
  Autofix Rubocop RSpec/LetBeforeExamples (#23671) Nick Schonning 2023-02-18 17:17:59 -05:00
• 1a02101100
  Autofix Rubocop Style/EmptyLambdaParameter (#23705) Nick Schonning 2023-02-18 17:12:06 -05:00
• 3680e032b4
  Autofix Rubocop RSpec/EmptyLineAfterFinalLet (#23707) Nick Schonning 2023-02-18 17:10:19 -05:00
• 2177daeae9
  Autofix Rubocop Style/RedundantBegin (#23703) Nick Schonning 2023-02-18 17:09:40 -05:00
• 167709f6b0
  Autofix Rubocop Style/BlockDelimiters (#23706) Nick Schonning 2023-02-18 17:00:17 -05:00
• c0d7c855b3
  Autofix Rubocop RSpec/Capybara/FeatureMethods (#23708) Nick Schonning 2023-02-18 16:59:00 -05:00
• 08289a38fa
  Autofix Rubocop Style/TrailingCommaInArrayLiteral (#23692) Nick Schonning 2023-02-18 16:54:30 -05:00
• 4a6cc45f9d
  
  Merge remote-tracking branch 'upstream/main' into develop v4.1.0+1.0.1 Jeremy Kescher 2023-02-18 22:37:05 +01:00
• 4c68189d2b
  Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream Claire 2023-02-18 22:05:11 +01:00
• a2e10a8b97 Merge upstream changes into glitch neatchee 2023-02-18 12:44:47 -08:00
• 1be110d5fb Merge remote-tracking branch 'mastodon/main' neatchee 2023-02-18 10:40:40 -08:00
• 287b4f1f5a
  Merge branch 'glitch-soc:main' into main neatchee 2023-02-18 10:26:59 -08:00
• ea9a1d79df [Glitch] Upgrade to Stylelint 15 with Prettier Nick Schonning 2023-02-12 22:57:03 -05:00
• 7e64eef73b [Glitch] Enable ESLint no-useless-escape Nick Schonning 2023-02-13 09:12:14 -05:00
• 587f6b3b06 [Glitch] Enable ESLint import recommended rules Claire 2023-02-13 20:09:01 +01:00
• 5069769cbe
  Autofix Rubocop Style/TrailingCommaInHashLiteral (#23693) Nick Schonning 2023-02-18 09:33:41 -05:00
• de4b8224c0
  Run bundler-audit on PRs (#23514) Nick Schonning 2023-02-18 06:49:09 -05:00
• b4cbfff3eb
  Autofix Rubocop RSpec/ExcessiveDocstringSpacing (#23666) Nick Schonning 2023-02-18 06:47:37 -05:00
• 7e215b3bda
  Check for missing i18n strings in CI (#23368) Nick Schonning 2023-02-18 06:46:44 -05:00
• b4df632ca1
  Run prettier on full repo with ignored extensions (#23538) Nick Schonning 2023-02-18 06:44:45 -05:00
• c38bd17657
  Autofix Rubocop Style/TrailingCommaInArguments (#23694) Nick Schonning 2023-02-18 06:39:58 -05:00
• ab7816a414
  Autofix Rubocop Style/Lambda (#23696) Nick Schonning 2023-02-18 06:39:00 -05:00
• e2a3ebb271
  Autofix Rubocop Style/IfUnlessModifier (#23697) Nick Schonning 2023-02-18 06:37:47 -05:00
• 2be88d1930
  New Crowdin updates (#2111) Claire 2023-02-18 11:16:30 +01:00
• 9ab2a775c9
  Set CI concurrency at the job level (#23689) Nick Schonning 2023-02-18 00:56:16 -05:00
• 49b9ef0c1e
  Bump oj from 3.13.23 to 3.14.2 (#23560) dependabot[bot] 2023-02-18 14:21:10 +09:00
• 8aee4de034
  Autofix Rubocop Style/PerlBackrefs (#23649) Nick Schonning 2023-02-18 00:20:20 -05:00
• a6f77aa28a
  Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681) Nick Schonning 2023-02-17 22:30:23 -05:00
• e2567df860
  Enable Lint/RedundantCopDisableDirective (#23687) Nick Schonning 2023-02-17 22:30:14 -05:00
• d65b2c1924
  Apply Rubocop Style/RedundantConstantBase (#23463) Nick Schonning 2023-02-17 22:30:03 -05:00
• e4f37fad98
  Only run latest for PR Rebase job (#23688) Nick Schonning 2023-02-17 22:25:31 -05:00
• a7db0b41cd
  Autofix Rubocop Lint/ParenthesesAsGroupedExpression (#23682) Nick Schonning 2023-02-17 22:00:05 -05:00
• e5cf23cf3a
  Enable Rubocop RSpec/HooksBeforeExamples (#23668) Nick Schonning 2023-02-17 21:59:57 -05:00
• efd424506a
  Autofix Rubocop Style/RedundantPercentQ (#23651) Nick Schonning 2023-02-17 21:32:57 -05:00
• 7a941b42d3
  Remove Style/Copyright Rubocop (#23665) Nick Schonning 2023-02-17 21:26:41 -05:00
• c0a645f647
  Autofix Rubocop RSpec/ExampleWording (#23667) Nick Schonning 2023-02-17 21:26:20 -05:00
• 7a3d4c3d4b
  Enable Rubocop RSpec/MultipleDescribes (#23672) Nick Schonning 2023-02-17 21:25:47 -05:00
• 54318dcd6d
  Autofix Rubocop RSpec/ClassCheck (#23685) Nick Schonning 2023-02-17 21:24:16 -05:00
• 634368c491
  Autofix Rubocop Lint/SymbolConversion (#23683) Nick Schonning 2023-02-17 21:23:49 -05:00
• 6d42820e5d
  Autofix Rubocop Lint/AmbiguousOperator (#23680) Nick Schonning 2023-02-17 21:22:01 -05:00
• ac59d6f19f
  Enable Rubocop Style/NumericLiterals (#23647) Nick Schonning 2023-02-17 21:05:57 -05:00
• 669f6d2c0a
  Run rubocop formatting except line length (#23632) Nick Schonning 2023-02-17 16:56:20 -05:00
• 593bb8ce99
  Autofix Rubocop Style/RaiseArgs (#23650) Nick Schonning 2023-02-17 08:47:23 -05:00
• 6ed6c41724
  Autofix Rubocop RSpec/EmptyLineAfterExample (#23661) Nick Schonning 2023-02-17 07:46:00 -05:00
• 68b1071f86
  Autofix Rubocop RSpec/BeNil (#23653) Nick Schonning 2023-02-17 07:45:27 -05:00
• 936204b9ea
  Autofix Rubocop Style/NestedParenthesizedCalls (#23646) Nick Schonning 2023-02-17 07:43:10 -05:00
• 37914c8757
  Autofix Rubocop Style/MethodCallWithoutArgsParentheses (#23645) Nick Schonning 2023-02-17 07:36:14 -05:00
• 4a1bad2fd8
  Bump babel-jest from 29.4.2 to 29.4.3 (#23654) dependabot[bot] 2023-02-17 10:26:16 +01:00
• 640d1aec1f
  Bump jest-environment-jsdom from 29.4.2 to 29.4.3 (#23655) dependabot[bot] 2023-02-17 10:19:23 +01:00
• 7cf3430e63
  Bump webauthn from 2.5.2 to 3.0.0 (#23659) dependabot[bot] 2023-02-17 10:06:24 +01:00
• df3faecb46
  Bump jest from 29.4.2 to 29.4.3 (#23657) dependabot[bot] 2023-02-17 09:56:03 +01:00
• 80ed656239
  Bump yargs from 17.6.2 to 17.7.0 (#23656) dependabot[bot] 2023-02-17 09:54:14 +01:00
• ba8b57050d
  Bump sass from 1.58.0 to 1.58.2 (#23658) dependabot[bot] 2023-02-17 09:52:30 +01:00
• cde13349cb
  Fix bad type for spellCheck attribute (#23638) Christian Schmidt 2023-02-17 09:51:27 +01:00
• 2e93886537
  Enable Depependabot on Docker images (#23553) Nick Schonning 2023-02-17 02:54:12 -05:00
• 6ef68d4106
  
  Update and fix dependencies v4.1.0+1.0.0 Jeremy Kescher 2023-02-17 00:29:06 +01:00
• 8de39432a9
  
  Merge remote-tracking branch 'upstream/main' into develop Jeremy Kescher 2023-02-17 00:26:21 +01:00
• 68a92c81bf
  Generate minimimal Rubocop Todo file (#23629) Nick Schonning 2023-02-16 01:33:50 -05:00
• 5e1c0c3d94
  Enable ESLint Promise plugin defaults (#22229) Nick Schonning 2023-02-16 01:30:56 -05:00
• 29ec2c4fb5
  Trigger CI build on .nvmrc change (#23627) Nick Schonning 2023-02-15 22:59:45 -05:00
• 1f957c6325
  Use .nvmrc file for CI setup-node (#23562) Nick Schonning 2023-02-15 20:24:05 -05:00
• 630975bf41
  New Crowdin updates (#23527) Eugen Rochko 2023-02-16 02:23:03 +01:00
• 418c3a4699
  Move Jest tests to filtered GitHub Action (#23623) Nick Schonning 2023-02-15 19:24:35 -05:00
• fb8503e861
  Upgrade to Ruby 3.2 (#22928) Aaron Patterson 2023-02-14 23:30:27 -08:00
• d15a9df6fe
  Fix paths with url-encoded @ to redirect to the correct path (#23593) Thijs Kinkhorst 2023-02-14 19:05:57 +01:00
• 66f715550e
  Add memorial attribute to REST API (#23591) Claire 2023-02-14 13:50:55 +01:00
• 520c73c12f
  Bump babel-jest from 29.4.1 to 29.4.2 (#23583) dependabot[bot] 2023-02-14 09:44:26 +01:00
• 6f34fdcd86
  Bump jest-environment-jsdom from 29.4.1 to 29.4.2 (#23582) dependabot[bot] 2023-02-14 09:35:10 +01:00
• a4f22e4343
  Bump jest from 29.4.1 to 29.4.2 (#23585) dependabot[bot] 2023-02-14 09:27:24 +01:00
• 526361a5e9
  Bump prettier from 2.8.3 to 2.8.4 (#23584) dependabot[bot] 2023-02-14 09:14:29 +01:00
• cfad64daeb
  Bump webpack-bundle-analyzer from 4.7.0 to 4.8.0 (#23581) dependabot[bot] 2023-02-14 09:14:10 +01:00
• 64f9ced09f
  Bump axios from 1.3.2 to 1.3.3 (#23580) dependabot[bot] 2023-02-14 09:12:41 +01:00
• 14ad013f5e
  Bump ws from 8.12.0 to 8.12.1 (#23579) dependabot[bot] 2023-02-14 09:12:21 +01:00
• 93e36c0d55
  Bump stylelint-config-standard-scss from 7.0.0 to 7.0.1 (#23578) dependabot[bot] 2023-02-14 09:12:14 +01:00
• 737fbe5c02
  Bump nokogiri from 1.14.1 to 1.14.2 (#23577) dependabot[bot] 2023-02-14 09:11:51 +01:00
• 7bc946e8da
  Bump aws-sdk-s3 from 1.119.0 to 1.119.1 (#23586) dependabot[bot] 2023-02-14 09:07:12 +01:00
• 40fc917a86 [Glitch] Fix case-sensitive check for previously used hashtags Dean Bassett 2023-02-13 05:54:08 -08:00
• 58291b31fa [Glitch] Fix attached media uploads not being cleared when replying to a post Claire 2023-02-10 22:03:35 +01:00
• ce84d163cc Merge branch 'main' into glitch-soc/merge-upstream Claire 2023-02-13 19:35:35 +01:00
• d6930b3847
  Add API parameter to safeguard unexpect mentions in new posts (#18350) Claire 2023-02-13 16:36:29 +01:00
• c84f38abc4
  chewy from 7.2.4 to 7.2.7 (#23572) Shlee 2023-02-13 15:33:34 +00:00
• 45e2936c89
  Add tests to indicate inclusion of self replies in statuses endpoint (#23266) Varun Sharma 2023-02-13 20:34:26 +05:30
• f553b064e0
  Switch OpenID Connect gems (#23223) Stan Hu 2023-02-13 09:47:50 -05:00
• eddfb33dfe
  Enable ESLint import recommended rules (#23315) Nick Schonning 2023-02-13 09:12:31 -05:00
• db2c58d47a
  Enable ESLint no-useless-escape (#23311) Nick Schonning 2023-02-13 09:12:14 -05:00
• 4da5f77d92
  Fix case-sensitive check for previously used hashtags (#23526) Dean Bassett 2023-02-13 05:54:08 -08:00
• 841263a548
  Update Ruby to 3.0.5 (#23544) Nick Schonning 2023-02-13 08:39:24 -05:00
• 5f56818f9e
  Change followed_by link to location=all if account is local on /admin/accounts/:id page (#23467) Jeong Arm 2023-02-13 22:39:00 +09:00
• 93d7c26fa5
  Bump rubocop from 1.44.1 to 1.45.1 (#23523) dependabot[bot] 2023-02-13 14:38:43 +01:00
• cc92c65d83
  Add dependency on net-http (#23571) Claire 2023-02-13 14:36:07 +01:00
• 66f2ad483c
  Bump sidekiq-scheduler from 5.0.0 to 5.0.1 (#23569) dependabot[bot] 2023-02-13 13:55:55 +01:00
• 31352f0d2c
  Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212) dependabot[bot] 2023-02-13 13:31:42 +01:00
• c55568c75a
  Add tests for REST::AccountSerializer (#23319) Claire 2023-02-13 13:23:59 +01:00
• 7c5d396fca
  Replace hamlit-rails with haml-rails (#23542) Nick Schonning 2023-02-12 22:59:30 -05:00
• d874877b27
  Update SECURITY.md (#23545) Takeshi Umeda 2023-02-13 12:58:56 +09:00
• c6b7e04120
  Sync Node.js to 16.19 patch release (#23554) Nick Schonning 2023-02-12 22:58:37 -05:00
• a1c0573bc6
  Yarn cache cleanup right after install in Docker (#23557) Nick Schonning 2023-02-12 22:57:51 -05:00
• 0c9d455ea5
  Upgrade to Stylelint 15 with Prettier (#23558) Nick Schonning 2023-02-12 22:57:03 -05:00
• ee42505452
  fix hashtag ordering (#2107) Dean Bassett 2023-02-12 09:58:02 -08:00
• 8eb74c88ec
  New Crowdin updates (#2100) Claire 2023-02-12 18:16:08 +01:00
• c812cfa667
  Enable EditorConfig trailing whitespace trimming (#23543) Nick Schonning 2023-02-12 02:34:17 -05:00
• e7b81d7d96
  Bump blurhash from 0.1.6 to 0.1.7 (#23517) Eugen Rochko 2023-02-11 04:02:07 +01:00
• 7c45145430
  fix metrics format (#23520) emilweth 2023-02-11 03:00:44 +01:00
• c1b823368c
  dot is not allowed (#23519) emilweth 2023-02-11 02:15:07 +01:00
• 27e11c2c7d Merge remote-tracking branch 'glitch-soc/main' neatchee 2023-02-10 16:44:01 -08:00
• dc02a93d04
  Merge pull request #2105 from ClearlyClaire/glitch-soc/merge-upstream Claire 2023-02-10 22:56:36 +01:00
• 87419f9307 Merge branch 'main' into glitch-soc/merge-upstream Claire 2023-02-10 22:49:59 +01:00
• 61c5dfb929
  Update changelog (#23515) Claire 2023-02-10 22:48:49 +01:00
• 70c0d754a6
  Bump version to 4.1.0 (#23471) Claire 2023-02-10 22:21:23 +01:00
• 0c9eac80d8
  Fix unbounded recursion in post discovery (#23506) Claire 2023-02-10 22:16:37 +01:00
• 719bb799be
  Remove DesspSouce config (#23513) Nick Schonning 2023-02-10 16:04:13 -05:00
• bae17ebe5e
  Fix attached media uploads not being cleared when replying to a post (#23504) Claire 2023-02-10 22:03:35 +01:00
• 71ae17e8f5
  New Crowdin updates (#23413) Eugen Rochko 2023-02-10 21:42:08 +01:00
• e18b9a3263 Merge remote-tracking branch 'mastodon/main' neatchee 2023-02-10 11:25:48 -08:00
• cefa33e56c Fix missed merge conflict neatchee 2023-02-10 11:20:17 -08:00
• 07507b98f5 Merge remote-tracking branch 'neatchee/feat/notification-collapse' neatchee 2023-02-10 11:18:45 -08:00
• 4ceadc65b0 Merge branch 'main' into glitch-soc/merge-upstream Claire 2023-02-10 13:48:21 +01:00
• a9c220242b
  Fix admin-set follow recommandations being case-sensitive (#23500) Claire 2023-02-10 11:14:58 +01:00
• 67de888bad
  Fix server status URL being a required server setting (#23499) Claire 2023-02-10 10:20:43 +01:00
• f23d30100a
  Cleanup unused i18n strings (#23426) Nick Schonning 2023-02-09 08:46:42 -05:00
• 5e37906083 [Glitch] Add scrolling to Compare history modal cadars 2023-02-06 16:53:31 +01:00
• 2dfbdc3f9d [Glitch] Show spinner while loading follow requests Christian Schmidt 2023-02-06 16:50:08 +01:00
• 8fd6c36243 [Glitch] Spell check input fields Christian Schmidt 2023-02-04 16:34:21 +01:00
• 95e2cab22e [Glitch] Add setting for status page URL Eugen Rochko 2023-02-04 04:56:06 +01:00
• 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream Claire 2023-02-09 12:46:12 +01:00
• c5a4d8c82d
  Add information about database pool to metrics endpoint in streaming API (#23469) Eugen Rochko 2023-02-09 11:24:16 +01:00
• 4cb7647516
  Add database pool configuration over DB_POOL to streaming API (#23470) Eugen Rochko 2023-02-09 11:20:59 +01:00
• a48ae2b86b
  code review from glitch (#47) Dean Bassett 2023-02-08 17:34:10 -08:00
• 4b48b88e6b
  remove random newline in imports dean 2023-02-08 16:06:15 -08:00
• 832595d1e7
  Remove posts count and last posts from ActivityPub representation of hashtag collections (#23460) Claire 2023-02-08 17:57:25 +01:00
• 08001e387b
  Bump axios from 1.2.6 to 1.3.2 (#23420) dependabot[bot] 2023-02-08 10:54:51 +01:00
• 0592937264
  Apply Rubocop Rails/WhereNot (#23448) Nick Schonning 2023-02-08 04:39:57 -05:00
• 11557d1c5a
  Apply Rubocop Rails/RootPublicPath (#23447) Nick Schonning 2023-02-08 04:38:07 -05:00
• 0d1f192c54
  Apply Rubocop Performance/BlockGivenWithExplicitBlock (#23441) Nick Schonning 2023-02-08 04:36:23 -05:00
• 26ac2447b4
  Apply Rubocop Style/EmptyElse (#23449) Nick Schonning 2023-02-08 01:08:39 -05:00