aboutsummaryrefslogtreecommitdiffstats
path: root/models/pull.go
Commit message (Collapse)AuthorAgeFilesLines
* Force-push to base repo's ref/pull/#/head (#3393)Sandro Santilli2018-01-191-0/+1
| | | | | | | | | | | * Force-push to base repo's ref/pull/#/head Fixes force-pushing to pull request branches, otherwise failing with: [...gitea/models/pull.go:1022 AddTestPullRequestTask()] [E] PushToBaseRepo: Push: exit status 1 - To /path/to/gitea-repositories/org/repo.git ! [rejected] issue-fix -> refs/pull/20/head (non-fast-forward) * format
* Change how merged PR commit info are prepared (#3368)Lauris BH2018-01-191-3/+8
| | | | | | | | | | * Change how merged PR commits and diff are made * Update code.gitea.io/git dependency * Fix typo * Remove unneeded local variable
* Remove hardcoded paths to fix randomly failing tests (#3347)Lauris BH2018-01-111-1/+1
| | | | | | * Remove hardcoded paths to fix randomly failing tests * Use correct function for merge path
* Add Pull Request merge options - Ignore white-space for conflict checking, ↵Lauris BH2018-01-051-16/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Refactor struct's time to remove unnecessary memory usage (#3142)Lunny Xiao2017-12-111-27/+12
| | | | | | | | | | | | | | * 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
* table `pull_request` wasn't updated correctly (#2649)Kazuki Sawada2017-10-061-1/+1
| | | | | | * Fix: table `pull_request` won't be updated correctly * Update also status column when manually merged
* Replace deprecated Id method with ID (#2655)Ethan Koenig2017-10-051-4/+4
|
* Use AfterLoad instead of AfterSet on Structs (#2628)Lunny Xiao2017-10-011-9/+6
| | | | | | | | * use AfterLoad instead of AfterSet on Structs * fix the comments on AfterLoad * fix the comments on action AfterLoad
* Reduce usage of allcols on update (#2596)Lunny Xiao2017-09-251-1/+1
| | | | | | * reduce usage of allcols on update * fix bug and tests
* Improve issue search (#2387)Ethan Koenig2017-09-161-0/+2
| | | | | | | | | | * Improve issue indexer * Fix new issue sqlite bug * Different test indexer paths for each db * Add integration indexer paths to make clean
* Fix SQL bug in models.PullRequestsEthan Koenig2017-07-011-2/+1
|
* Fix exit status 1 not handled @ getMergeCommitBwko2017-06-301-1/+1
|
* Fix fast-forward PR bug (#1989)Ethan Koenig2017-06-221-3/+3
|
* Refactor session close as xorm already does everything needed internally (#2020)Lauris BH2017-06-211-2/+2
|
* Wrong PR merge commit ID saved (#2007)Lauris BH2017-06-191-1/+1
|
* Don't ignore error in getMergeCommit (#1843)Ethan Koenig2017-05-311-3/+9
|
* Update code.gitea.io/git (#1824)Ethan Koenig2017-05-301-1/+4
| | | | | | | | * Update code.gitea.io/git * Update function calls * govendor fetch
* Fix activity feed (#1779)Ethan Koenig2017-05-261-8/+7
| | | | | | | | | | | | * Fix activity feed Preserve actions after user/repo name change * Add missing comment * Fix migration, and remove fields completely * Tests
* fixes wrong after field in webhook payloadDiep Pham2017-05-181-1/+1
| | | | when merge pull request
* fix potential lock when sqlite (#1647)Lunny Xiao2017-05-051-21/+27
|
* Add create_at and updated_at in PR json (#1616)Jonas Östanbäck2017-04-271-0/+2
| | | | * Move new fields to object creation (use reference) * Vendor: Update SDK
* Add length check for the return string (#1420)Mura Li2017-03-311-1/+3
| | | | | | | | * Add length check for the return string * Differentiate error paths and logging messages * Rectify error message
* LableIDs -> LabelIDs (#1088)Ethan Koenig2017-03-011-1/+1
|
* fix setMerged for remove unnecessary db connection (#1067)Lunny Xiao2017-02-271-6/+11
|
* Check for manual merging of a pull request (#719)Bwko2017-02-051-17/+143
| | | | When an open pull request got manually merged mark the pull request as merged
* Cleanup log messagingGabriel Jackson2017-02-021-1/+1
| | | | | | | | | 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.
* add milestone changed traker on issue view (#804)Lunny Xiao2017-02-011-1/+1
|
* Allow custom public files (#782)Thomas Boerger2017-01-281-1/+1
| | | | | | * Allow custom public files * Gofmt code, lots of places not related to this pr
* Refactor process package and introduce ProcessManager{} with tests (#75)Matthias Loibl2017-01-171-9/+9
| | | | | | | | | | * 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
* Merge pull request #555 from ethantkoenig/tests/pullAndrey Nering2017-01-061-5/+27
|\ | | | | Unit tests for models/pull.go
| * Unit tests for models/pull.goEthan Koenig2017-01-061-5/+27
| |
* | Create missing database indexes (#596)Andrey Nering2017-01-061-6/+6
|/
* Fix typos in models/ (#576)Ethan Koenig2017-01-051-8/+8
|
* Speed up conflict checking in pull request creation (#276)typeless2016-12-291-8/+15
| | | | | | | | | | | | | | | | | | * 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 '-'
* update code.gitea.io/git (#450)Lunny Xiao2016-12-221-1/+1
|
* Fix string format verbs (#3637)Alexander Lunegov2016-12-221-1/+1
|
* Remove fixed FIXME (#408)Richie B2B2016-12-161-1/+0
|
* Fixes issue #283Bwko2016-12-091-0/+3
| | | | Delete old temp local copy before we create a new temp local copy
* Bug fixes for repo permissions in APIEthan Koenig2016-12-071-6/+6
| | | | Also move duplicated code into repo.APIFormat(..)
* Fix regression in PR-API #248 (#349)Kim "BKC" Carlbäcker2016-12-051-7/+39
| | | * Fix #344 (regression in PR-API #248)
* Fix for #320Bwko2016-12-031-3/+2
| | | | Suppress the error when we're removing a file that may not exist
* [API] Pull Requests (#248)Kim "BKC" Carlbäcker2016-12-021-0/+84
|
* Catch os... errorsBwko2016-12-021-2/+9
|
* typoLunny Xiao2016-12-011-3/+3
|
* Fix breakage from vendor-updateKim "BKC" Carlbäcker2016-11-291-1/+1
|
* golint fixed for models/pull.go (#292)Lunny Xiao2016-11-281-7/+21
|
* Golint fixed for modules/setting (#262)Lunny Xiao2016-11-271-1/+1
| | | | | | * golint fixed for modules/setting * typo fixed and renamed UNIXSOCKET to UnixSocket
* Lint action.goSandro Santilli2016-11-241-1/+1
|
* Normalize files with gofmtThibault Meyer2016-11-111-3/+3
|
* Fix import path of go-sdk (#141)Sandro Santilli2016-11-111-1/+1
| | | | From code.gitea.io/go-sdk/gitea To code.gitea.io/sdk/gitea
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 09:39:22 +0000