mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity
6,056 Commits 12 Branches 235 Tags 592 MiB
Commit Graph

11 Commits

Author SHA1 Message Date
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
 2018-01-05 20:56:50 +02:00
Ethan Koenig befa7445d2 Unit tests for routers/repo/issue_label (#3198) 2017-12-15 23:11:02 +02:00
Ethan Koenig e59adcde65 Use httptest in integration tests (#3080) 2017-12-04 00:46:01 +02:00
Lauris BH c7f4f07765 Integration test for activity page (#2704) 
* Integration test for activity page

* Small code refactoring for acitvity page

* Move activity stats calculation logic to model
 2017-10-16 00:54:53 +03:00
Lauris BH 1ec4dc6c1d Fix so that user can still fork his own repository to owned organizations (#2699) 
* Fix so that user can still fork his own repository to his organizations

* Fix to only use owned organizations

* Add integration test for forking own repository to owned organization
 2017-10-15 18:06:07 +03:00
Ethan Koenig f1adaef458 Less verbose integration tests (#2123) 
* Helper functions for intergration test boilerplate
 2017-07-07 21:36:47 +02:00
Ethan Koenig f64c232953 Improve integration test helper functions (#2049) 
Set request headers in helper functions, and new helper for requests with string-formatted URLs
 2017-06-25 08:15:42 +08:00
Lauris BH 0a5dc640a1 Make branch deletion URL more like GitHub's, fixes #1397 (#1994) 
* Make branch deletion URL more like GitHub's, fixes #1397

* Add PR branch deletion integration test

* Do not allow deleting protected branch

* Change http error code to 403 if user has no write rights to repository

* Add check to not panic if forked repository has alrady been deleted
 2017-06-21 09:00:03 +08:00
Bo-Yi Wu 90f9bb12c6 fix golint error and rename func for suggestion. (#1997) 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2017-06-17 11:29:59 -05:00
Ethan Koenig ce9b86082c Consolidate boilerplate in integration tests (#1979) 2017-06-17 12:49:45 +08:00
Mura Li 01322af2e8 Add integration test for pull-request merge (#1912) 2017-06-15 19:20:39 +08:00