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

backport of PR #1257 for release/v1.1: rewrite pre-commit, post-commit and options hooks #1376

Merged
merged 8 commits into from
Mar 28, 2017
Merged

backport of PR #1257 for release/v1.1: rewrite pre-commit, post-commit and options hooks #1376

merged 8 commits into from
Mar 28, 2017

Conversation

philfry
Copy link
Contributor

@philfry philfry commented Mar 23, 2017

See #1257

@lunny lunny added the type/bug label Mar 23, 2017
@lunny lunny added this to the 1.1.1 milestone Mar 23, 2017
@philfry
Copy link
Contributor Author

philfry commented Mar 23, 2017

I kept the version name v26 to avoid conflicts with future merges, even though it breaks the consistency of numbering the migrations. Any thoughts on this -- shall I rename it back to v23?

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 23, 2017
@lunny
Copy link
Member

lunny commented Mar 23, 2017

keep v26 or change it to v23 will both make it impossible to upgrade from v1.1.1 to v1.2.

strk
strk suggested changes Mar 23, 2017
View reviewed changes
Copy link
Member

@strk strk left a comment

Choose a reason for hiding this comment

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

We cannot change db version in stable branches

models/migrations/migrations.go Outdated
@@ -94,6 +94,8 @@ var migrations = []Migration{
NewMigration("rewrite authorized_keys file via new format", useNewPublickeyFormat),
// v21 -> v22
NewMigration("generate and migrate wiki Git hooks", generateAndMigrateWikiGitHooks),
// v23 -> v24
NewMigration("generate and migrate repo and wiki Git hooks", generateAndMigrateGitHookChains),
Copy link
Member

Choose a reason for hiding this comment

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

No migrations can be allowed in 1.1 branch

@lunny lunny added the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label Mar 23, 2017
@philfry
Copy link
Contributor Author

philfry commented Mar 23, 2017

Ok, so no migration for 1.1. I removed the questionable parts.

@strk
Copy link
Member

strk commented Mar 23, 2017

LGTM

@tboerger tboerger 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 Mar 23, 2017
@lunny
Copy link
Member

lunny commented Mar 24, 2017

So we have to add a notice on Release Notes that if he cannot work on other script type hook, he should click the resync public key ... button on the Admin Panel. @tboerger
Then LGTM

@tboerger tboerger 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 Mar 24, 2017
@bkcsoft
Copy link
Member

bkcsoft commented Mar 24, 2017

This is another reason why I want to change the way migrations work 🙂

Add a release-file in changelog/v1.1.1 please. Format in #1298

@bkcsoft
Copy link
Member

bkcsoft commented Mar 24, 2017

Oh, I found a new use for my changelog-script... generate entries for the blog-post, with notes 😂

@lunny lunny removed the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label Mar 24, 2017
@lunny
Copy link
Member

lunny commented Mar 28, 2017

@bkcsoft let's move the changelog thing after v1.2

@lunny lunny merged commit 2482c67 into go-gitea:release/v1.1 Mar 28, 2017
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@strk strk strk requested changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.1.1
Development

Successfully merging this pull request may close these issues.
5 participants
@philfry @lunny @strk @bkcsoft @tboerger