WIP: /activiteiten/ --> /activities/ #2890

Draft
doczkal wants to merge 3 commits from doczkal/fsfe-website:activiteiten_url_activities into master
Collaborator

/activiteiten/ --> /activities/

/activiteiten/ --> /activities/
doczkal added 1 commit 3 months ago
continuous-integration/drone/pr Build is failing Details
e28eabaea6
/activiteiten/ --> /activities/
Collaborator

@doczkal the image of the news item news/2021/news-20210504-01.nl.xhtml is not in the right format :/ I would suggest to exclude this news item form the PR and then we should be able to merge it. Sorry for the extra work.

@doczkal the image of the news item news/2021/news-20210504-01.nl.xhtml is not in the right format :/ I would suggest to exclude this news item form the PR and then we should be able to merge it. Sorry for the extra work.
Poster
Collaborator

I don't care about the size of the image and think we should still update the translation in the link.

I don't care about the size of the image and think we should still update the translation in the link.
doczkal added 1 commit 3 months ago
Collaborator

Same as in the PR #2902. I would love to find a better solution and to be able to merge those PRs. If you have any I would be delighted. I know that it is annoying with the githooks preventing to merge old files. After SFScon I might have time to find and resize the picture.

Same as in the PR #2902. I would love to find a better solution and to be able to merge those PRs. If you have any I would be delighted. I know that it is annoying with the githooks preventing to merge old files. After SFScon I might have time to find and resize the picture.
bonnie changed title from /activiteiten/ --> /activities/ to WIP: /activiteiten/ --> /activities/ 3 months ago
Poster
Collaborator

i think I used to be able to commit to master directly. I'll have a look if that's still possible.

i think I used to be able to commit to master directly. I'll have a look if that's still possible.
doczkal added 1 commit 3 months ago
Poster
Collaborator

@bonnie seems I am no longer allowed to commit to master directly.

@bonnie seems I am no longer allowed to commit to master directly.
Collaborator

Huhu Thomas,

Em, if you want to merge the PR then the githooks are preventing you from merging.
I have talked to @tobiasd about this and we will have a look how to best resolve this. For now the only option I can think of is to exclude the old file with the wrong picture format: news/2021/news-20210504-01.nl.xhtml
Or to resize the picture.
We could create a separate PR for those old files and look a solution for them while also merging those files that are inline with the githooks. As this is not the first PR to run into trouble with githooks and old files.

Let me know what you think.
Best,
Bonnie

Huhu Thomas, Em, if you want to merge the PR then the githooks are preventing you from merging. I have talked to @tobiasd about this and we will have a look how to best resolve this. For now the only option I can think of is to exclude the old file with the wrong picture format: news/2021/news-20210504-01.nl.xhtml Or to resize the picture. We could create a separate PR for those old files and look a solution for them while also merging those files that are inline with the githooks. As this is not the first PR to run into trouble with githooks and old files. Let me know what you think. Best, Bonnie
Collaborator

Yes I think this would be the easiest way. Take the one file out for now and deal with it in a separate PR.

Yes I think this would be the easiest way. Take the one file out for now and deal with it in a separate PR.
Collaborator

Hey @doczkal I've reworked the preview image used in the news/2021/news-20210504-01.nl.xhtml file, when you use https://pics.fsfe.org/uploads/medium/e7/1d/2a46b6b0ae647555cc0d90b8de1d.png in line 195 the CI checks should pass.

Hey @doczkal I've reworked the preview image used in the `news/2021/news-20210504-01.nl.xhtml` file, when you use https://pics.fsfe.org/uploads/medium/e7/1d/2a46b6b0ae647555cc0d90b8de1d.png in line 195 the CI checks should pass.
Some checks failed
continuous-integration/drone/pr Build is failing
Required
Details
This pull request is marked as a work in progress.
Sign in to join this conversation.
Loading…
There is no content yet.