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

Revert "Mark models/fixtures as generated (#24775)" #24782

Merged
merged 2 commits into from
May 18, 2023
Merged

Revert "Mark models/fixtures as generated (#24775)" #24782

merged 2 commits into from
May 18, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented May 18, 2023 •
edited
Loading

They are not generated in some cases (although they can).

And we should keep an eye on these files when reviewing.

When reviewing, files can be marked as "Viewed" and then it is collapsed.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 18, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 18, 2023
@wxiaoguang wxiaoguang mentioned this pull request May 18, 2023
Merged
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 18, 2023
@lunny
Copy link
Member

lunny commented May 18, 2023

The fixtures changes are not very frequent and they should be reviewed. Broken fixtures data may result in a wrong-correct test.

a1012112796
a1012112796 approved these changes May 18, 2023
View reviewed changes
Copy link
Member

@a1012112796 a1012112796 left a comment

Choose a reason for hiding this comment

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

by the way, I'd like have a way to auto generate fixtures files by doing something on a tmp dev server instead of manually writing.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 18, 2023
@silverwind silverwind enabled auto-merge (squash) May 18, 2023 07:42
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 18, 2023
@silverwind silverwind merged commit 76138ca into go-gitea:main May 18, 2023
@GiteaBot GiteaBot added this to the 1.20.0 milestone May 18, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 18, 2023
@wxiaoguang wxiaoguang deleted the revert-test-fixures branch May 18, 2023 08:16
@yardenshoham yardenshoham added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label May 18, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 19, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
585d015 
* giteaofficial/main:
  replace `drone exec` to `act_runner exec` in test README.md (go-gitea#24791)
  Fix OAuth loading state (go-gitea#24788)
  Remove duplicated issues options and some more refactors (go-gitea#24787)
  Revert "Mark `models/fixtures` as generated (go-gitea#24775)" (go-gitea#24782)
  Remove background on user dashboard filter bar (go-gitea#24779)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@a1012112796 a1012112796 a1012112796 approved these changes

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.
6 participants
@wxiaoguang @lunny @silverwind @a1012112796 @yardenshoham @GiteaBot