Skip to content

Conversation

@mmattel
Copy link
Contributor

@mmattel mmattel commented Oct 16, 2017

Description

This PR removes double quotes unintentionally added in the boolean result values from status.php
An QA issue has been raised owncloud/QA#500 (Add scenario to check status.php output)
A documentation release note PR follows asap

Related Issue

#29228 (Change in status.php from 9.1.x to 10.x)

Motivation and Context

How Has This Been Tested?

Access yourdomain/status.php

{"installed":true,"maintenance":false,"needsDbUpgrade":true,"version":"10.0.3.3","versionstring":"10.0.3","edition":"Community","productname":"ownCloud"}

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@mmattel
Copy link
Contributor Author

mmattel commented Oct 16, 2017

Documentation PR is here: owncloud-archive/documentation#3458
@PVince81

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81
Copy link
Contributor

@mmattel please backport to stable10, thanks a lot!

@PVince81
Copy link
Contributor

Waiting for Travis...

@codecov
Copy link

codecov bot commented Oct 17, 2017

Codecov Report

Merging #29261 into master will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #29261   +/-   ##
=========================================
  Coverage     59.43%   59.43%           
  Complexity    17154    17154           
=========================================
  Files          1027     1027           
  Lines         57193    57193           
=========================================
  Hits          33991    33991           
  Misses        23202    23202
Impacted Files Coverage Δ Complexity Δ
lib/public/Util.php 40.6% <0%> (ø) 68 <0> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d9f22f1...893a9f0. Read the comment docs.

@mmattel
Copy link
Contributor Author

mmattel commented Oct 17, 2017

@PVince81 mind to help me how to backport? I have never done that before and no clue...

@PVince81
Copy link
Contributor

@mmattel create a branch from stable10, then git cherry-pick your commits onto that branch. Then push and create a pull request that targets stable10 instead of master.

@mmattel
Copy link
Contributor Author

mmattel commented Oct 17, 2017

This worked fine...

sudo git checkout -b bp_stable10 origin/stable10
Checking out files: 100% (1432/1432), done.
Branch stable10 set up to track remote branch stable10 from origin.
Switched to a new branch 'bp_stable10'

sudo git cherry-pick 893a9f0
[bp_stable10 ec81f45] Remove double quotes from boolean values in status.php output
 Date: Mon Oct 16 17:48:19 2017 +0200
 1 file changed, 3 insertions(+), 3 deletions(-)

But either sudo git push or sudo git push -u origin stable10 reports me following error:

Counting objects: 5, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 481 bytes | 0 bytes/s, done.
Total 5 (delta 4), reused 0 (delta 0)
remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/stable10.
remote: error: 3 of 3 required status checks are expected. At least one approved review is required by reviewers with write access.
To https://github.com/owncloud/core.git
 ! [remote rejected] stable10 -> stable10 (protected branch hook declined)
error: failed to push some refs to 'https://github.com/owncloud/core.git'

What am I doing wrong?

@phil-davis
Copy link
Contributor

phil-davis commented Oct 17, 2017

You should not push back to stable10. My commands would be something like:

  1. get stable10 up to date from GitHub
git fetch origin
git checkout stable10
git pull
  1. branch and cherry-pick
git checkout -b stable10-fix_for_29228
git cherry-pick <commit-id>
git push

and follow the message that git push gives you to make stable10-fix_for_29228 push itself to origin.

Then go to GitHub and it will be suggesting for you to make a PR from that branch - make the PR to stable10 ...

@PVince81
Copy link
Contributor

glad to be reminded that pushing to stable10 directly is forbidden in the repo settings 😄

@mmattel
Copy link
Contributor Author

mmattel commented Oct 17, 2017

I created a documentation PR owncloud-archive/documentation#3463 to guide backporting

@PVince81 PVince81 merged commit f853d9b into master Oct 18, 2017
@PVince81 PVince81 deleted the fix_for_29228 branch October 18, 2017 08:34
@mmattel
Copy link
Contributor Author

mmattel commented Oct 18, 2017

Q: is it necessary to have that documented so admins know we have fix it in 10.0.4?

@PVince81
Copy link
Contributor

I think the known issues section is enough for now.

@lock
Copy link

lock bot commented Aug 2, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants