diff options
author | Julian <julian.toelle97@gmail.com> | 2018-12-27 11:27:08 +0100 |
---|---|---|
committer | Lauris BH <lauris@nix.lv> | 2018-12-27 12:27:08 +0200 |
commit | 4a685f8b872a3d4c101c5e8165fa99e696c8fb45 (patch) | |
tree | 7ad36ee9bf87cec61ee0967a50037d9331d2ab58 /models/migrations/migrations.go | |
parent | 58bdff53cd98e33791f91584d02887864aabc5c4 (diff) | |
download | gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.tar.gz gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.zip |
Add rebase with merge commit merge style (#3844) (#4052)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
Diffstat (limited to 'models/migrations/migrations.go')
-rw-r--r-- | models/migrations/migrations.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 5a9c80a829..1fa94c42aa 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -204,6 +204,8 @@ var migrations = []Migration{ NewMigration("add approval whitelists to protected branches", addApprovalWhitelistsToProtectedBranches), // v75 -> v76 NewMigration("clear nonused data which not deleted when user was deleted", clearNonusedData), + // v76 -> v77 + NewMigration("add pull request rebase with merge commit", addPullRequestRebaseWithMerge), } // Migrate database to current version |