Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable29] fix(lookup-server): disable when not using global scale #51407

Merged
merged 4 commits into from
Mar 11, 2025

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Mar 11, 2025

Backport of #51404

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested a review from susnux March 11, 2025 20:44
@backportbot backportbot bot added bug 3. to review Waiting for reviews labels Mar 11, 2025
@backportbot backportbot bot added this to the Nextcloud 29.0.13 milestone Mar 11, 2025
@susnux susnux changed the title [stable29] [stable31] fix(lookup-server): disable when not using global scale [stable29] fix(lookup-server): disable when not using global scale Mar 11, 2025
susnux added 4 commits March 11, 2025 21:56
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux susnux force-pushed the backport/51404/stable29 branch from 9413c9d to 21bbb61 Compare March 11, 2025 20:59
@susnux susnux marked this pull request as ready for review March 11, 2025 21:00
@@ -1039,8 +1039,10 @@
if ($this->gsConfig->isGlobalScaleEnabled()) {
return true;
}
$result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes');
return ($result === 'yes');
$result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';

Check notice

Code scanning / Psalm

DeprecatedMethod Note

The method OCP\IConfig::getAppValue has been marked as deprecated
@@ -1054,8 +1056,10 @@
if ($this->gsConfig->isGlobalScaleEnabled()) {
return false;
}
$result = $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes');
return ($result === 'yes');
$result = $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'no') === 'yes';

Check notice

Code scanning / Psalm

DeprecatedMethod Note

The method OCP\IConfig::getAppValue has been marked as deprecated
@AndyScherzinger AndyScherzinger merged commit 703c60d into stable29 Mar 11, 2025
181 of 186 checks passed
@AndyScherzinger AndyScherzinger deleted the backport/51404/stable29 branch March 11, 2025 22:41
@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable28

@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable27

@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable26

@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable25

@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable24

@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable23

@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable22

@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable28

@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable27

@susnux
Copy link
Contributor

susnux commented Mar 12, 2025

/backport to stable26

Copy link
Author

backportbot bot commented Mar 12, 2025

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

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/51407/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 4ec1edb8 e674631f 92c48d03 21bbb61a

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/51407/stable28

Error: Failed to clone repository: Failed to create working tree: Preparing worktree (new branch 'backport/51407/stable28')
fatal: a branch named 'backport/51407/stable28' already exists


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@skjnldsv
Copy link
Member

/backport to stable28

Copy link
Author

backportbot bot commented Mar 12, 2025

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

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/51407/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 4ec1edb8 e674631f 92c48d03 21bbb61a

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/51407/stable28

Error: Failed to clone repository: git is not defined


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@skjnldsv
Copy link
Member

/backport to stable28

1 similar comment
@skjnldsv
Copy link
Member

/backport to stable28

Copy link
Author

backportbot bot commented Mar 12, 2025

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

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/51407/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 4ec1edb8 e674631f 92c48d03 21bbb61a

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/51407/stable28

Error: Failed to clone repository: Cannot use simple-git on a directory that does not exist


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@skjnldsv
Copy link
Member

/backport to stable28

@skjnldsv
Copy link
Member

/backport to stable27

@skjnldsv
Copy link
Member

/backport to stable26

@skjnldsv
Copy link
Member

/backport to stable25

@skjnldsv
Copy link
Member

/backport to stable24

@skjnldsv
Copy link
Member

/backport to stable23

@skjnldsv
Copy link
Member

/backport to stable22

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants