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

fixes #26874. Finished renaming display_settings to preferences. I had to change the name of some files to preferences in order to avoid conflicts. #29161

Closed
wants to merge 1 commit into from

Conversation

Shgit29
Copy link
Collaborator

@Shgit29 Shgit29 commented Mar 2, 2024

Renamed Display settings to Preferences

Fixes: #26874

Self-review checklist
  • [yes] Self-reviewed the changes for clarity and maintainability
    (variable names, code reuse, readability, etc.).

Communicate decisions, questions, and potential concerns.

  • [yes ] Explains differences from previous plans (e.g., issue description).
  • Highlights technical choices and bugs encountered.
  • Calls out remaining decisions and concerns.
  • [yes] Automated tests verify logic where appropriate.

Individual commits are ready for review (see commit discipline).

  • [yes] Each commit is a coherent idea.
  • [yes] Commit message(s) explain reasoning and motivation for changes.

Completed manual review and testing of the following:

  • Visual appearance of the changes.
  • Responsiveness and internationalization.
  • Strings and tooltips.
  • End-to-end functionality of buttons, interactions and flows.
  • Corner cases, error conditions, and easily imagined bugs.

@Shgit29
Copy link
Collaborator Author

Shgit29 commented Mar 2, 2024

All the checks have passed.

@Mahhheshh
Copy link
Contributor

@Shgit29, Zulip follows its own commit guidelines. You can read about the commit disciplines and clean up your commit message history.

@Shgit29
Copy link
Collaborator Author

Shgit29 commented Mar 2, 2024

@Shgit29, Zulip follows its own commit guidelines. You can read about the commit disciplines and clean up your commit message history.

I will make sure to follow them the next time. This was my first time submitting a PR to zulip. Is it a must to fix it right now?

@Mahhheshh
Copy link
Contributor

Is it a must to fix it right now?

Yes, you can squash your commits in a single one, and force push to current branch, it will fix the commit history. If you are new to github or parts that I have mentioned take a look git guide.

@Mahhheshh
Copy link
Contributor

the commit message should be setting: Rename display settings to preferences..

@Shgit29
Copy link
Collaborator Author

Shgit29 commented Mar 3, 2024

the commit message should be setting: Rename display settings to preferences..

Hey, so I have changed the commit history now. Thank you so much for pointing it out, and providing me with a solution.

@Mahhheshh
Copy link
Contributor

Thanks, could you please clear the commit description also??.

@Shgit29
Copy link
Collaborator Author

Shgit29 commented Mar 5, 2024

Thanks, could you please clear the commit description also??.

Done.

@Shgit29
Copy link
Collaborator Author

Shgit29 commented Mar 7, 2024

Thanks, could you please clear the commit description also??.

With the changes made, this PR is ready for review.

@alya
Copy link
Contributor

alya commented Mar 13, 2024

Thanks for the fix! Could you please update your commit message to match the commit style guidelines?

@Shgit29 Shgit29 force-pushed the main branch 5 times, most recently from 878f078 to 22bd804 Compare March 13, 2024 01:54
@Shgit29 Shgit29 changed the title Finish renaming Display settings -> Preferences fixes #26874. Finished renaming display_settings to preferences. I had to change the name of some files to preferences to avoid conflicts. Mar 13, 2024
@Shgit29
Copy link
Collaborator Author

Shgit29 commented Mar 13, 2024

Thanks for the fix! Could you please update your commit message to match the commit style guidelines?

Done.

@Shgit29 Shgit29 changed the title fixes #26874. Finished renaming display_settings to preferences. I had to change the name of some files to preferences to avoid conflicts. fixes #26874. Finished renaming display_settings to preferences. I had to change the name of some files to preferences in order to avoid conflicts. Mar 13, 2024
@zulipbot
Copy link
Member

Heads up @Shgit29, we just merged some commits that conflict with the changes you made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the upstream/main branch and resolve your pull request's merge conflicts accordingly.

@karlstolley
Copy link
Contributor

You have just done a search-and-replace here. I'm closing this PR, because you're making changes to the logic and haven't carefully studied the impact of these changes. Once you understand the impact of your work, you're welcome to open another PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Finish renaming Display settings -> Preferences
5 participants