Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/admin.tsx`: Changes applied to `app/javascript/core/admin.ts` instead.
This commit is contained in:
commit
f01605c665
4 files changed
+16
-17
No files matched your search
+1
-3
@@ -1,3 +1,4 @@
|
||||
comment: false # Do not leave PR comments
|
||||
coverage:
|
||||
status:
|
||||
project:
|
||||
@@ -8,6 +9,3 @@ coverage:
|
||||
default:
|
||||
# Github status check is not blocking
|
||||
informational: true
|
||||
comment:
|
||||
# Only write a comment in PR if there are changes
|
||||
require_changes: true
|
||||
Reference in new issue
Block a user