Repository navigation
fixed diffs w/ upstream nextcloud git - #129
Merged
Merged
Conversation
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
FiddlyRumpus
changed the title
Collaborator
Member
|
@FiddlyRumpus can you rebase and PR against branch v18? We're collecting various optimizations there before merge. Thanks |
Collaborator
Author
|
rebased against v18 @aptalca |
Member
|
You need to rebase and prevent all conflicts. Feel free to open a fresh PR |
Author
|
Conflict resolved @aptalca |
Collaborator
thelamer
pushed a commit
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
We welcome all PR’s though this doesn’t guarantee it will be accepted.
Description:
Benefits of this PR and context:
How Has This Been Tested?
Source / References: