pleroma/pleroma.social
0
0
Fork 0
Code Issues 10 Pull requests 5 Projects Releases Packages Wiki Activity

Fix apple-touch-icon.png, fixes #11 #84

Open
seanking wants to merge 1 commit from gitlab-mr-iid-69 into master
pull from: gitlab-mr-iid-69
merge into: pleroma:master
Conversation 2 Commits 1 Files changed 1 +1 -3
seanking commented 2022-08-16 02:20:23 +00:00
Member
Copy link

Realized source/images/apple-touch-icon.png is supposed to be a symbolic link. This should fix that.

Initially placed as draft since the LFS label being next to it in "Changes" but not in the actual branch confuses me:

image

image

But I think we'll be fine?

Realized `source/images/apple-touch-icon.png` is supposed to be a symbolic link. This should fix that. Initially placed as draft since the LFS label being next to it in "Changes" but not in the actual branch confuses me: ![image](/attachments/4f087e1a-4572-4aac-be69-e9356f470279) ![image](/attachments/7ce31dfa-ca12-452f-a2a3-9fb35098ce6e) But I think we'll be fine?
image.png
103 KiB
image.png
315 KiB
tusooa commented 2022-08-16 02:27:44 +00:00
Owner
Copy link

it was a regular file before?

it was a regular file before?
seanking commented 2022-08-16 02:42:22 +00:00
Author
Member
Copy link

What happened was when it was first added in d355c56bb2, apple-touch-icon.png was a symlink. When it was migrated in #66, that symlink broke. This simply changes that to what it was before. Here's what I did:

  • Cloned it and ran git lfs fetch origin master.
  • cd source/images/
  • rm -f apple-touch-icon.png
  • ln -s pleroma_logo_vector_bg_180.png apple-touch-icon.png
  • Then, I ran build.sh and started a static server with http-server build/ to test it and the apple-touch-icon.png no longer returned a 404.
  • I then did the usual git adding, committing, checking out new branch, and pushing.

I don't know if it's the proper way to do it, but that's what I did.

What happened was when it was first added in d355c56bb20e7cd4b452b6ad2ba1ea7d5c114be6, `apple-touch-icon.png` was a symlink. When it was migrated in #66, that symlink broke. This simply changes that to what it was before. Here's what I did: - Cloned it and ran `git lfs fetch origin master`. - `cd source/images/` - `rm -f apple-touch-icon.png` - `ln -s pleroma_logo_vector_bg_180.png apple-touch-icon.png` - Then, I ran `build.sh` and started a static server with `http-server build/` to test it and the `apple-touch-icon.png` no longer returned a 404. - I then did the usual git adding, committing, checking out new branch, and pushing. I don't know if it's the proper way to do it, but that's what I did.
This pull request can be merged automatically.
This branch is out-of-date with the base branch
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-69:gitlab-mr-iid-69
git switch gitlab-mr-iid-69

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-69
git switch gitlab-mr-iid-69
git rebase master
git switch master
git merge --ff-only gitlab-mr-iid-69
git switch gitlab-mr-iid-69
git rebase master
git switch master
git merge --no-ff gitlab-mr-iid-69
git switch master
git merge --squash gitlab-mr-iid-69
git switch master
git merge --ff-only gitlab-mr-iid-69
git switch master
git merge gitlab-mr-iid-69
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Graphics

   
Legal

Things like licensing

No labels
Graphics
Legal
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/pleroma.social!84
No description provided.