Skip to content

Conversation

@MariusBluem
Copy link
Member

Backport of #579

cc @jancborchardt @ChristophWurst @nextcloud/designers

@MariusBluem MariusBluem added enhancement design Design, UI, UX, etc. 3. to review Waiting for reviews labels Jul 27, 2016
@MariusBluem MariusBluem added this to the Nextcloud 10.0 milestone Jul 27, 2016
@jancborchardt
Copy link
Member

@Mar1u5 usually we backport the commits by using git cherry-pick <commit id>. ;) That makes it easier to verify it’s the same commit. :)

@ChristophWurst
Copy link
Member

👍

@MariusBluem
Copy link
Member Author

@jancborchardt Ah... Okay 😁 Will do this in the future 😉

@ChristophWurst
Copy link
Member

@Mar1u5 usually we backport the commits by using git cherry-pick . ;) That makes it easier to verify it’s the same commit. :)

right. @Mar1u5 please use cherry-pick instead ;-)

@MariusBluem
Copy link
Member Author

Uhmm... Time to read some git documentation stuff 😅 For now, I do not trust myself in doing that correctly 😁

@nickvergessen
Copy link
Member

@Mar1u5

git fetch origin master
git fetch origin stable10
git checkout stable10
git checkout -b backport-<pull request id>-10
git cherry-pick <commit id>
git push origin backport-<pull request id>-10

And then send a PR from backport-<pull request id>-10 against stable10

@nickvergessen
Copy link
Member

For now 👍

Btw app id as well as app are loaded as icons, it seems?

@schiessle
Copy link
Member

👍

@nickvergessen nickvergessen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 27, 2016
@MorrisJobke
Copy link
Member

Sadly I have no idea, why scrutinizer doesn't start the job. The hook is properly send (with a 200 from scrutinizer) but it doesn't show up in the list of jobs at scrutinizer-ci.org 🙈

I will merge this now.

@MorrisJobke MorrisJobke merged commit df3cacd into stable10 Jul 27, 2016
@MorrisJobke MorrisJobke deleted the stable10-app-icons branch July 27, 2016 11:03
R0Wi pushed a commit to R0Wi/server that referenced this pull request Nov 22, 2025
…check

fix(Podman-HealthCheck): treat empty health status as success.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish design Design, UI, UX, etc. enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants