Skip to content

Conversation

@acataluddi
Copy link

The current NGINX configuration triggers the following warning

nginx: [warn] duplicate extension "js", content type: "text/javascript", previous content type: "application/javascript" in /etc/nginx/sites-enabled/www.example.com.conf:124

@acataluddi
Copy link
Author

Hi @susnux,

I've rebased the latest master to modernise the branch and highlight the actual code changes.

Kind regards,
Adriano

@ChristophWurst
Copy link
Member

the rebase went wrong unfortunately

@susnux susnux changed the base branch from master to fix/duplicated-nginx-js June 15, 2023 19:25
@susnux susnux changed the base branch from fix/duplicated-nginx-js to master June 15, 2023 19:28
Copy link
Contributor

@susnux susnux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I fixed the rebase (you accidentally merged the master branch in resulted in duplicated commits)

@susnux
Copy link
Contributor

susnux commented Jun 15, 2023

@acataluddi but before we can merge this you need to sign you commit.

(pull and git commit --amend -s)

@acataluddi
Copy link
Author

@acataluddi but before we can merge this you need to sign you commit.

Hi @susnux, done.

Kind regards,
Adriano C.

@nickvergessen nickvergessen removed their request for review June 21, 2023 07:36
@ChristophWurst
Copy link
Member

@nickvergessen you accidentally dropped the sign-off

@nickvergessen
Copy link
Member

I used the Github button "Update branch".
I don't think it removed anything, but it more was not sign-off-ed before.

@blizzz blizzz added this to the Nextcloud 29 milestone Nov 23, 2023
@joshtrichards joshtrichards linked an issue Dec 24, 2023 that may be closed by this pull request
Copy link

@msundin msundin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested ok that this removes the warning.

@miaulalala
Copy link
Contributor

Hi @acataluddi - seems the signoff was dropped. Can you please checkout your branch, do a pull, rebase on current master and do git commit --amend -s?

@acataluddi acataluddi requested a review from Antreesy as a code owner April 28, 2024 11:07
@acataluddi
Copy link
Author

Hi @acataluddi - seems the signoff was dropped. Can you please checkout your branch, do a pull, rebase on current master and do git commit --amend -s?

Hi Anna,

I've signed off all the commits and pushed the branch for a second review.

Kind regards,
Adriano C.

@susnux susnux merged commit 3a9375b into nextcloud:master Apr 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Nginx mime-type is not the same as Apache one

8 participants