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.

Sign up for GitHub

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

Jump to bottom

Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again #3958

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again #3958

merged 2 commits into from
Aug 29, 2023

Conversation

PikachuEXE
Copy link
Collaborator

Pull Request Type

  • Bugfix
  • Feature Implementation
  • Documentation
  • Other

Related issue

"Issue" introduced by #3865

Description

When I try to merge development into my playlist branch
I found duplicate icon constant entries due to new constants added in #3865 not ordered properly
This PR fixes it

Screenshots

Look at code diff is enough

Testing

None needed

Desktop

  • OS:
  • OS Version:
  • FreeTube version:

Additional context

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) August 28, 2023 06:49
@github-actions github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Aug 28, 2023
@kommunarr
Copy link
Collaborator

suggestion: Could you add a code comment at the top of the file explaining why the order must be maintained?

@PikachuEXE
Copy link
Collaborator Author

@jasonhenriquez
Thanks for the suggestion please take a look now

@efb4f5ff-1298-471a-8973-3d47447115dc @ChunkyProgrammer
Sorry for the need to re-review -,-

kommunarr
kommunarr approved these changes Aug 29, 2023
View reviewed changes
Copy link
Collaborator

@kommunarr kommunarr left a comment

Choose a reason for hiding this comment

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

LGTM

@FreeTubeBot FreeTubeBot merged commit 1a6c9e9 into FreeTubeApp:development Aug 29, 2023
@github-actions github-actions bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Aug 29, 2023
PikachuEXE added a commit to PikachuEXE/FreeTube that referenced this pull request Aug 29, 2023
@PikachuEXE
Merge branch 'development' into feature/playlist-2023-05
4b21e75 
* development: (65 commits)
  Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again (FreeTubeApp#3958)
  Replace labeler workflow with GH labeler (FreeTubeApp#3966)
  Fix HTML styling (e.g., hashtag links) showing up as raw HTML in descriptions (FreeTubeApp#3946)
  Make certain controls non-selectable / non-draggable - Part II (FreeTubeApp#3957)
  Translated using Weblate (German)
  Show video list buttons on hover or focus (FreeTubeApp#3954)
  Bump @babel/eslint-parser from 7.22.10 to 7.22.11 (FreeTubeApp#3962)
  Bump youtubei.js from 6.0.0 to 6.1.0 (FreeTubeApp#3965)
  Bump eslint-plugin-n from 16.0.1 to 16.0.2 (FreeTubeApp#3964)
  Bump eslint from 8.47.0 to 8.48.0 (FreeTubeApp#3963)
  Bump marked from 7.0.4 to 7.0.5 (FreeTubeApp#3961)
  Bump @babel/core from 7.22.10 to 7.22.11 (FreeTubeApp#3959)
  Make certain controls non-selectable / non-draggable (FreeTubeApp#3947)
  Add updated video resolution to auto selector (FreeTubeApp#3935)
  Fix Save icon blocking issue (FreeTubeApp#3951)
  * Update URL parser to recognize youtube.com/live/xxxxxxx (FreeTubeApp#3930)
  Translated using Weblate (Czech)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Polish)
  Translated using Weblate (Arabic)
  ...

# Conflicts:
#	src/renderer/main.js
#	src/renderer/scss-partials/_ft-list-item.scss
PikachuEXE added a commit to PikachuEXE/FreeTube that referenced this pull request Aug 29, 2023
@PikachuEXE
Merge branch 'feature/playlist-2023-05' into custom-builds/current
aaf5f03 
* feature/playlist-2023-05: (77 commits)
  * Update add to playlist prompt to add sort options
  ! Fix user playlist view incorrectly sorted playlists by latest updated first when filtered
  ! Fix add to play prompt max width
  * Update sorting options labels
  Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again (FreeTubeApp#3958)
  Replace labeler workflow with GH labeler (FreeTubeApp#3966)
  ! Fix unable to visit previous video when playing first video in a playlist
  * Update upcoming video to allow saving in playlist
  * Show filtering input & sorting element when no. of playlist > 1
  Fix HTML styling (e.g., hashtag links) showing up as raw HTML in descriptions (FreeTubeApp#3946)
  Make certain controls non-selectable / non-draggable - Part II (FreeTubeApp#3957)
  Translated using Weblate (German)
  Show video list buttons on hover or focus (FreeTubeApp#3954)
  Bump @babel/eslint-parser from 7.22.10 to 7.22.11 (FreeTubeApp#3962)
  Bump youtubei.js from 6.0.0 to 6.1.0 (FreeTubeApp#3965)
  Bump eslint-plugin-n from 16.0.1 to 16.0.2 (FreeTubeApp#3964)
  Bump eslint from 8.47.0 to 8.48.0 (FreeTubeApp#3963)
  Bump marked from 7.0.4 to 7.0.5 (FreeTubeApp#3961)
  Bump @babel/core from 7.22.10 to 7.22.11 (FreeTubeApp#3959)
  Make certain controls non-selectable / non-draggable (FreeTubeApp#3947)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kommunarr kommunarr kommunarr approved these changes

@ChunkyProgrammer ChunkyProgrammer ChunkyProgrammer approved these changes

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc approved these changes

@absidue absidue Awaiting requested review from absidue

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@PikachuEXE @kommunarr @efb4f5ff-1298-471a-8973-3d47447115dc @ChunkyProgrammer @FreeTubeBot