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

Add merge=union for the CHANGELOG file #339

Merged
merged 3 commits into from
Jan 17, 2023
Merged

Conversation

patch0
Copy link
Contributor

@patch0 patch0 commented Jan 17, 2023

This should reduce the amount of PR conflict

@patch0 patch0 temporarily deployed to previews/add-git-attributes-for-changelog January 17, 2023 11:53 — with GitHub Actions Inactive
Copy link
Contributor

@loiswells97 loiswells97 left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@github-actions
Copy link

@patch0 patch0 enabled auto-merge (squash) January 17, 2023 11:56
@github-actions
Copy link

@github-actions
Copy link

@patch0 patch0 merged commit fa266d3 into main Jan 17, 2023
@patch0 patch0 deleted the add-git-attributes-for-changelog branch January 17, 2023 11:59
patch0 added a commit that referenced this pull request Jan 17, 2023
 ## Added

- Styling of the projects list (#317)
- Ability to collapse and expand the left hand file pane (#316)
- Plausible event tracking for left hand file pane (#325)
- Last updated field added to the projects table (#319)
- Message for empty state on projects (#327)
- Rename project action on project index page (#324)
- Context menu for project index page actions on mobile (#324)
- Danger button styling (#330)

 ## Changed

- Change port number to fix 'no consent token' error (#326)
- Long file names truncated rather than scrolling in left hand file pane (#316, #337)
- Tab scrollbars only appear when necessary (#331)
- Added merge=union gitattribute for this file (#339)

 ## Fixed

- Make sure button text is always centered (#328)
- Make theme and font size persist across all pages of the app (#329)
- Make dismissing the Beta banner persist across all pages of the app (#329)
- Touch area of icon-only buttons (#330, #336)
- Delete project action on project index page (#330)
- Refactored project list loading to allow loading states to be shown (#330)
- Removed unneeded scrollbars on the editor and output panels (#331)
- Make Your projects page background extend below the fold (#334)
@patch0 patch0 mentioned this pull request Jan 17, 2023
patch0 added a commit that referenced this pull request Jan 17, 2023
## Added

- Styling of the projects list (#317)
- Ability to collapse and expand the left hand file pane (#316)
- Plausible event tracking for left hand file pane (#325)
- Last updated field added to the projects table (#319)
- Message for empty state on projects (#327)
- Rename project action on project index page (#324)
- Context menu for project index page actions on mobile (#324)
- Danger button styling (#330)

## Changed

- Change port number to fix 'no consent token' error (#326)
- Long file names truncated rather than scrolling in left hand file pane
(#316, #337)
- Tab scrollbars only appear when necessary (#331)
- Added merge=union gitattribute for this file (#339)

## Fixed

- Make sure button text is always centered (#328)
- Make theme and font size persist across all pages of the app (#329)
- Make dismissing the Beta banner persist across all pages of the app
(#329)
- Touch area of icon-only buttons (#330, #336)
- Delete project action on project index page (#330)
- Refactored project list loading to allow loading states to be shown
(#330)
- Removed unneeded scrollbars on the editor and output panels (#331)
- Make Your projects page background extend below the fold (#334)
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.

None yet

2 participants