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

Sign merges, CRUD, Wiki and Repository initialisation with gpg key #7631

Merged
merged 27 commits into from
Oct 16, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b205fdf
Enable use of default gpg key for signing commits
zeripath Jul 26, 2019
9f8cdb5
fix more unix date uses
zeripath Aug 1, 2019
35b68ce
Merge branch 'master' into web-sign
zeripath Aug 7, 2019
e5f8508
Merge branch 'master' into web-sign
zeripath Aug 16, 2019
5e5d201
fix verification for provided key id and file response
zeripath Aug 16, 2019
c4fda14
Add some integration test for gpg signing
zeripath Aug 16, 2019
483ac21
fix issue with default reason
zeripath Aug 17, 2019
7d0ffa9
Merge branch 'master' into web-sign
zeripath Aug 17, 2019
4c8487f
update vendor
zeripath Aug 17, 2019
dae22e7
Use gpg.error.not_signed_commit instead of unsigned for unsigned commits
zeripath Aug 17, 2019
f4a07a5
Restore old signing key, name, and email at end of gpg_git_test
zeripath Aug 17, 2019
b674f17
fix repofiles_delete_test
zeripath Aug 17, 2019
52740e6
Make it possible to get per repository signing-keys
zeripath Aug 17, 2019
09d771a
Update documentation
zeripath Aug 17, 2019
cf35ac6
Merge branch 'master' into web-sign
zeripath Aug 17, 2019
a7dca0b
Merge branch 'master' into web-sign
zeripath Oct 9, 2019
5d827d5
Adjust the app.ini.sample to make SIGNING_* clearer
zeripath Oct 9, 2019
83fc620
Fix duplicate declaration of modules/settings in file_test
zeripath Oct 9, 2019
61bb5c2
Merge branch 'master' into web-sign
zeripath Oct 13, 2019
942ccbe
Ensure early git functionality
zeripath Oct 13, 2019
d245253
Add functionality note
zeripath Oct 13, 2019
a1f4a0d
Oops -m is present since 1.7.2 on commit
zeripath Oct 13, 2019
e1979a7
Merge branch 'master' into web-sign
zeripath Oct 14, 2019
b03ca96
Update docs/content/doc/advanced/signing.en-us.md
zeripath Oct 15, 2019
070a5c2
Merge branch 'master' into web-sign
zeripath Oct 15, 2019
7a01822
Add swagger definitions
zeripath Oct 15, 2019
f9f14c0
Merge branch 'master' into web-sign
lafriks Oct 16, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix more unix date uses
  • Loading branch information
zeripath committed Aug 1, 2019
commit 9f8cdb5820e9f415c8c33c61cced9ffb1c008fac
4 changes: 2 additions & 2 deletions models/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ func CleanUpMigrateInfo(repo *Repository) (*Repository, error) {

// initRepoCommit temporarily changes with work directory.
func initRepoCommit(tmpPath string, u *User) (err error) {
commitTimeStr := time.Now().Format(time.UnixDate)
commitTimeStr := time.Now().Format(time.RFC3339)

sig := u.NewGitSig()
// Because this may call hooks we should pass in the environment
Expand Down Expand Up @@ -1149,7 +1149,7 @@ func getRepoInitFile(tp, name string) ([]byte, error) {
}

func prepareRepoCommit(e Engine, repo *Repository, tmpDir, repoPath string, opts CreateRepoOptions) error {
commitTimeStr := time.Now().Format(time.UnixDate)
commitTimeStr := time.Now().Format(time.RFC3339)
authorSig := repo.Owner.NewGitSig()

// Because this may call hooks we should pass in the environment
Expand Down
2 changes: 1 addition & 1 deletion modules/pull/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
}

sig := doer.NewGitSig()
commitTimeStr := time.Now().Format(time.UnixDate)
commitTimeStr := time.Now().Format(time.RFC3339)

// Because this may call hooks we should pass in the environment
env := append(os.Environ(),
Expand Down