Skip to content

Adding a description icon to cards when they contain a description without any checkmarks#2626

Merged
juliusknorr merged 4 commits intonextcloud:masterfrom
MonkeySon:add-description-icon
Dec 28, 2020
Merged

Adding a description icon to cards when they contain a description without any checkmarks#2626
juliusknorr merged 4 commits intonextcloud:masterfrom
MonkeySon:add-description-icon

Conversation

@MonkeySon
Copy link
Copy Markdown
Contributor

Summary

Adding a description icon to cards when they contain a description without any checkmarks.

Checklist

  • Code is properly formatted
  • Sign-off message is added to all commits
  • Tests (unit, integration, api and/or acceptance) are included
  • Documentation (manuals or wiki) has been updated or is not required

Signed-off-by: Daniel Klepatsch <daniel.klepatsch@gmx.at>
Signed-off-by: Daniel Klepatsch <daniel.klepatsch@gmx.at>
Comment thread src/components/cards/CardBadges.vue Outdated
Copy link
Copy Markdown
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

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

Thanks for your pull request. I've added a minor comment, otherwise 👍

@juliusknorr
Copy link
Copy Markdown
Member

Mind to rebase and squash your comments? Then the DCO check should also be happy without the merge commit :)

@MonkeySon
Copy link
Copy Markdown
Contributor Author

Sorry I am rather new to git pull requests, rebases and squashes.
If I understand you correctly, I should merge (= squash) the last two commits (Merge & "Ignore descriptions that only contain spaces")?

Co-authored-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Daniel Klepatsch <daniel.klepatsch@gmx.at>
@MonkeySon MonkeySon force-pushed the add-description-icon branch from 8f827f8 to 21e0070 Compare November 30, 2020 14:38
@MonkeySon
Copy link
Copy Markdown
Contributor Author

MonkeySon commented Nov 30, 2020

Ok, I added the DOC to the latest commit, but I don't know how to get rid of the merge (master -> add-description-icon) commit.
I tried the command git rebase -i HEAD~2, but it does not include merge commits.

EDIT:
I think I understand it now.
The merge commit was automatically added by GitHub when I incorporated the suggestion, because some commits were added to the master branch in between my commits.
Now, after I manually signed-off the last commit, everything should be conform. Am I right with this assumption?

@MonkeySon MonkeySon requested a review from juliusknorr December 3, 2020 09:05
@juliusknorr juliusknorr merged commit 165656f into nextcloud:master Dec 28, 2020
@juliusknorr
Copy link
Copy Markdown
Member

Now, after I manually signed-off the last commit, everything should be conform. Am I right with this assumption?

Yes, that is all fine now. Thanks a lot for your pull request :)

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.

Undo removal of "has description" icon for cards

2 participants