お仕事してないけど 
a2ce7508c (upstream/main) Update docker-compose.yml (#16489)
7095c8037 Add ability to filter reports by origin of target account (#16487)
ca8ac1a63 Bump rubocop from 1.18.2 to 1.18.3 (#16477)
5c112959a Bump sass from 1.35.1 to 1.35.2 (#16478)
275fa4746 Add `configuration` attribute to `GET /api/v1/instance` (#16485)
3d5183e99 Use ruby-2.7.4 (#16481)
CONFLICT (content): Merge conflict in app/validators/status_length_validator.rb
あ、はい。
ん
class StatusLengthValidator < ActiveModel::Validator
<<<<<<< HEAD
MAX_CHARS = 1024
URL_PLACEHOLDER = "\1#{'x' * 23}"
=======
MAX_CHARS = 500
URL_PLACEHOLDER_CHARS = 23
URL_PLACEHOLDER = "\1#{'x' * URL_PLACEHOLDER_CHARS}"
>>>>>>> master
コンフリクト解消の確認わよ
$ git diff upstream/main app/validators/status_length_validator.rb
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index 4c258ec16..0e8f41ee0 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class StatusLengthValidator < ActiveModel::Validator
- MAX_CHARS = 500
+ MAX_CHARS = 1024
URL_PLACEHOLDER_CHARS = 23
URL_PLACEHOLDER = "\1#{'x' * URL_PLACEHOLDER_CHARS}"