Skip to content

Combine regex for ocs-provider and ocm-provider - #1293

Merged
MorrisJobke merged 3 commits into
masterfrom
shorten-regex
Mar 21, 2019
Merged

MorrisJobke merged 3 commits into
masterfrom
shorten-regex

Conversation

@josh4trunks

Copy link
Copy Markdown
Contributor

Combine regex for ocs-provider and ocm-provider. Slightly improves b714250#diff-490ed055ec68f0382edb4b4d680b761b by @schiessle

If someone could test this change to confirm I would appreciate it. Thank you

Combine regex for ocs-provider and ocm-provider
I don't see a reason I need my own statement, can just combine these sentences.
@skjnldsv
skjnldsv requested review from MorrisJobke and schiessle and removed request for schiessle March 5, 2019 21:32
Comment thread admin_manual/installation/nginx.rst Resolved
Co-Authored-By: josh4trunks <joshruehlig@gmail.com>
@skjnldsv
skjnldsv requested a review from schiessle March 6, 2019 08:47

@MorrisJobke MorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

@josh4trunks

Copy link
Copy Markdown
Contributor Author

I would appreciate review of this PR. It is very minor and should be quick to review/test.
Thanks!

@schiessle schiessle left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Didn't tested it, but looks good and I trust the people who already tested it.

@MorrisJobke
MorrisJobke merged commit a679038 into master Mar 21, 2019
@MorrisJobke
MorrisJobke deleted the shorten-regex branch March 21, 2019 12:58
@MorrisJobke

Copy link
Copy Markdown
Member

/backport to stable15

@MorrisJobke

Copy link
Copy Markdown
Member

/backport to stable14

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable14 failed. Please do this backport manually.

@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable15 in #1332

thelamer pushed a commit to linuxserver/docker-nextcloud that referenced this pull request Feb 7, 2020
* Bot Updating Package Versions

* fixed diffs w/ nextcloud upstream

Edit line 53, 67 - ocs-provider + ocm-provider, one call:
nextcloud/documentation@3206db9
nextcloud/documentation#1293

New line 55, edit 58 - try_files resets $fastcgi_path_info, fix so $path_info gets value:  
nextcloud/documentation@8f6c1aa
nextcloud/documentation#1679
thelamer pushed a commit to linuxserver/docker-nextcloud that referenced this pull request Feb 7, 2020
* php.ini and site config updates

* display real ip in nginx logs with rp

* fixed diffs w/ upstream nextcloud git (#129)

* Bot Updating Package Versions

* fixed diffs w/ nextcloud upstream

Edit line 53, 67 - ocs-provider + ocm-provider, one call:
nextcloud/documentation@3206db9
nextcloud/documentation#1293

New line 55, edit 58 - try_files resets $fastcgi_path_info, fix so $path_info gets value:  
nextcloud/documentation@8f6c1aa
nextcloud/documentation#1679

Co-authored-by: Evan Wade <evan+pgp@evanwade.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants