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

fix: rendering of merge emoji when upstream was modified #5064

Merged
merged 1 commit into from
Nov 17, 2024

Conversation

tfheen
Copy link
Contributor

@tfheen tfheen commented Nov 5, 2024

what

Without this, we would typically get

Plan: 3 to add, 0 to change, 0 to destroy.:twisted_rightwards_arrows: Upstream was modified, a new merge was performed.

With this, we should be getting whitespace before the :twisted_rightwards_arrows part.

why

Without this, we would not have our beautiful 🔀 rendered as an emoji.

@tfheen tfheen requested review from a team as code owners November 5, 2024 07:55
@tfheen tfheen requested review from chenrui333, nitrocode and X-Guardian and removed request for a team November 5, 2024 07:55
@jamengual jamengual changed the title Fix rendering of emoji when doing a merge. fix: rendering of emoji when doing a merge. Nov 5, 2024
@jamengual
Copy link
Contributor

@tfheen please sign the commits to pass DCO

@tfheen
Copy link
Contributor Author

tfheen commented Nov 8, 2024

Just to make sure I understand the request, you mean sign, as in adding a Signed-off-by? I can do that.

@nitrocode
Copy link
Member

nitrocode commented Nov 8, 2024

@tfheen See DCO GitHub action check run

Without this, we would typically get

```
Plan: 3 to add, 0 to change, 0 to destroy.:twisted_rightwards_arrows: Upstream was modified, a new merge was performed.
```

With this, we should be getting whitespace before the
`:twisted_rightwards_arrows` part.

Signed-off-by: Tollef Fog Heen <[email protected]>
@tfheen tfheen force-pushed the tfheen/fix-render branch from 63bca38 to 3c27b5c Compare November 9, 2024 08:25
@X-Guardian X-Guardian changed the title fix: rendering of emoji when doing a merge. fix: rendering of merge emoji when upstream was modified Nov 17, 2024
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Nov 17, 2024
@X-Guardian X-Guardian merged commit da75841 into runatlantis:main Nov 17, 2024
33 checks passed
terakoya76 pushed a commit to terakoya76/atlantis that referenced this pull request Dec 31, 2024
kvanzuijlen pushed a commit to kvanzuijlen/atlantis that referenced this pull request Jan 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm This PR has been approved by a maintainer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants