208 Commits (4f98e82427ea6a12b223d4f798a7dafcd01b68c8)

Author	SHA1	Message	Date
Lauris BH	be1330ec89	Remove hardcoded paths to fix randomly failing tests (#3347) ... * Remove hardcoded paths to fix randomly failing tests * Use correct function for merge path	7 years ago
Lauris BH	8ac1501ad7	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) ... * Pull request options migration and UI in settings * Add ignore whitespace functionality * Fix settings if pull requests are disabled * Fix migration transaction * Merge with Rebase functionality * UI changes and related functionality for pull request merging button * Implement squash functionality * Fix rebase merging * Fix pull request merge tests * Add squash and rebase tests * Fix API method to reuse default message functions * Some refactoring and small fixes * Remove more hardcoded values from tests * Remove unneeded check from API method * Fix variable name and comment typo * Fix reset commit count after PR merge	7 years ago
Lunny Xiao	f2e20c81b6	Refactor struct's time to remove unnecessary memory usage (#3142) ... * refactor struct's time to remove unnecessary memory usage * use AsTimePtr simple code * fix tests * fix time compare * fix template on gpg * use AddDuration instead of Add	7 years ago
Kazuki Sawada	ffab139c91	table `pull_request` wasn't updated correctly (#2649) ... * Fix: table `pull_request` won't be updated correctly * Update also status column when manually merged	7 years ago
Ethan Koenig	aa962deec0	Replace deprecated Id method with ID (#2655)	7 years ago
Lunny Xiao	a8717e5e3a	Use AfterLoad instead of AfterSet on Structs (#2628) ... * use AfterLoad instead of AfterSet on Structs * fix the comments on AfterLoad * fix the comments on action AfterLoad	7 years ago
Lunny Xiao	dd55534b82	Reduce usage of allcols on update (#2596) ... * reduce usage of allcols on update * fix bug and tests	7 years ago
Ethan Koenig	b0f7457d9e	Improve issue search (#2387) ... * Improve issue indexer * Fix new issue sqlite bug * Different test indexer paths for each db * Add integration indexer paths to make clean	7 years ago
Ethan Koenig	eae9154811	Fix SQL bug in models.PullRequests	8 years ago
Bwko	b36849dc1f	Fix exit status 1 not handled @ getMergeCommit	8 years ago
Ethan Koenig	902a749fd9	Fix fast-forward PR bug (#1989)	8 years ago
Lauris BH	6db387a21e	Refactor session close as xorm already does everything needed internally (#2020)	8 years ago
Lauris BH	165cf33771	Wrong PR merge commit ID saved (#2007)	8 years ago
Ethan Koenig	a977ab7889	Don't ignore error in getMergeCommit (#1843)	8 years ago
Ethan Koenig	474d636794	Update code.gitea.io/git (#1824) ... * Update code.gitea.io/git * Update function calls * govendor fetch	8 years ago
Ethan Koenig	0c332f0480	Fix activity feed (#1779) ... * Fix activity feed Preserve actions after user/repo name change * Add missing comment * Fix migration, and remove fields completely * Tests	8 years ago
Diep Pham	407fbfa6ce	fixes wrong after field in webhook payload ... when merge pull request	8 years ago
Lunny Xiao	0f3923c4d7	fix potential lock when sqlite (#1647)	8 years ago
Jonas Östanbäck	e4a0a04829	Add create_at and updated_at in PR json (#1616) ... * Move new fields to object creation (use reference) * Vendor: Update SDK	8 years ago
Mura Li	6a39250579	Add length check for the return string (#1420) ... * Add length check for the return string * Differentiate error paths and logging messages * Rectify error message	8 years ago
Ethan Koenig	22f7aa6e9c	LableIDs -> LabelIDs (#1088)	8 years ago
Lunny Xiao	d4e38cf129	fix setMerged for remove unnecessary db connection (#1067)	8 years ago
Bwko	bf647ce143	Check for manual merging of a pull request (#719) ... When an open pull request got manually merged mark the pull request as merged	8 years ago
Gabriel Jackson	bf6f61cc69	Cleanup log messaging ... This change corrects a few logging issues: * Standardized formatting errors with '%v'. * Standardized failure warning word usage. * Corrected an instance of using the standard log library when the gitea log library should be used instead.	8 years ago
Lunny Xiao	081485ecfd	add milestone changed traker on issue view (#804)	8 years ago
Thomas Boerger	78535fb08e	Allow custom public files (#782) ... * Allow custom public files * Gofmt code, lots of places not related to this pr	8 years ago
Matthias Loibl	d1006150fb	Refactor process package and introduce ProcessManager{} with tests (#75) ... * Add a process.Manager singleton with process.GetManager() * Use process.GetManager everywhere * Fix godoc comments for process module * Increment process counter id after locking the mutex	8 years ago
Andrey Nering	84b7d29d34	Create missing database indexes (#596)	8 years ago
Ethan Koenig	72bfabfada	Unit tests for models/pull.go	8 years ago
Ethan Koenig	1207bda94b	Fix typos in models/ (#576)	8 years ago
typeless	937b4b5aa1	Speed up conflict checking in pull request creation (#276) ... * Speed up conflict checking in pull request creation In order to check conflicts of a PR, we set up a working tree by cloning the base branch, which is quite time-consuming when the repository is huge. Instead, this PR uses `git read-tree` and `git apply --check --cached` to check conflicts. For #258 * Use $GIT_INDEX_FILE instead of --index-output to avoid lockfile problem The lockfile gets renamed to the final destination after the operation finishes. But it must be located in the same filesystem, which prevents us from using /tmp. * Temporary file names should not prefixed with '-'	8 years ago
Lunny Xiao	47a7529d96	update code.gitea.io/git (#450)	8 years ago
Alexander Lunegov	d5d21b67d2	Fix string format verbs (#3637)	8 years ago
Richie B2B	44428fdc38	Remove fixed FIXME (#408)	8 years ago
Bwko	cbcb4361d5	Fixes issue #283 ... Delete old temp local copy before we create a new temp local copy	8 years ago
Ethan Koenig	04b9a7e7a2	Bug fixes for repo permissions in API ... Also move duplicated code into repo.APIFormat(..)	8 years ago
Kim "BKC" Carlbäcker	d07c955e2a	Fix regression in PR-API #248 (#349) ... * Fix #344 (regression in PR-API #248)	8 years ago
Bwko	0118b275b6	Fix for #320 ... Suppress the error when we're removing a file that may not exist	8 years ago
Kim "BKC" Carlbäcker	0f05470cb8	[API] Pull Requests (#248)	8 years ago
Bwko	4ff0db0246	Catch os... errors	8 years ago
Lunny Xiao	646e02b521	typo	8 years ago
Kim "BKC" Carlbäcker	42ec5ce740	Fix breakage from vendor-update	8 years ago
Lunny Xiao	1d0f811399	golint fixed for models/pull.go (#292)	8 years ago
Lunny Xiao	94da472717	Golint fixed for modules/setting (#262) ... * golint fixed for modules/setting * typo fixed and renamed UNIXSOCKET to UnixSocket	8 years ago
Sandro Santilli	dd9d0f3732	Lint action.go	8 years ago
Thibault Meyer	ddee4c8b58	Normalize files with gofmt	8 years ago
Sandro Santilli	a1c5f02444	Fix import path of go-sdk (#141) ... From code.gitea.io/go-sdk/gitea To code.gitea.io/sdk/gitea	8 years ago
Thibault Meyer	a4454f5d0f	Rewrite XORM queries	8 years ago
Sandro Santilli	4247304f5a	Update import paths from github.com/go-gitea to code.gitea.io (#135) ... - Update import paths from github.com/go-gitea to code.gitea.io - Fix import path for travis See https://docs.travis-ci.com/user/languages/go#Go-Import-Path	8 years ago
Sandro Santilli	80eea77953	Use MixedCase constant names ... See https://github.com/golang/go/wiki/CodeReviewComments#mixed-caps	8 years ago