pleroma/emoji-index
0
0
Fork 0
Code Issues 3 Pull requests 2 Projects Releases Packages Wiki Activity

Add Blank package #13

Open
hakabahitoyo wants to merge 2 commits from gitlab-mr-iid-9 into master
pull from: gitlab-mr-iid-9
merge into: pleroma:master
Conversation 4 Commits 2 Files changed 4 +15
hakabahitoyo commented 2021-04-29 11:28:53 +00:00
Member
Copy link

This blank package has only 1 emoji :blank:.

This emoji is mandatory for https://mamemomonga.github.io/mastodon-custom-emoji-oekaki/.

This `blank` package has only 1 emoji `:blank:`. This emoji is mandatory for https://mamemomonga.github.io/mastodon-custom-emoji-oekaki/.
hakabahitoyo commented 2021-04-30 00:19:32 +00:00
Author
Member
Copy link

This MR uses LFS but is it really good? (I saw #2.)

This MR uses LFS but is it really good? (I saw #2.)
rinpatch commented 2021-04-30 14:58:57 +00:00
Member
Copy link

Is it really necessary? blank.png is currently bundled with pleroma and I do not think we will remove it

Is it really necessary? blank.png is currently bundled with pleroma and I do not think we will remove it
hakabahitoyo commented 2021-04-30 19:29:36 +00:00
Author
Member
Copy link

In OTP install, blank.png is not recognized.

In OTP install, blank.png is not recognized.
hakabahitoyo commented 2021-04-30 20:21:31 +00:00
Author
Member
Copy link

In the OTP install, /var/lib/pleroma/static/emoji hides /opt/pleroma/lib/pleroma-2.3.0-1-gb221d77a/priv/static/emoji.

In the OTP install, `/var/lib/pleroma/static/emoji` hides `/opt/pleroma/lib/pleroma-2.3.0-1-gb221d77a/priv/static/emoji`.
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin gitlab-mr-iid-9:gitlab-mr-iid-9
git switch gitlab-mr-iid-9

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff gitlab-mr-iid-9
git switch gitlab-mr-iid-9
git rebase master
git switch master
git merge --ff-only gitlab-mr-iid-9
git switch gitlab-mr-iid-9
git rebase master
git switch master
git merge --no-ff gitlab-mr-iid-9
git switch master
git merge --squash gitlab-mr-iid-9
git switch master
git merge --ff-only gitlab-mr-iid-9
git switch master
git merge gitlab-mr-iid-9
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
pleroma/emoji-index!13
No description provided.