coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
gitroast/integrations
History
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
..
gitea-repositories-meta Improve LFS tests + fix lfs url refs + keep path upper/lowercase in db. (#3092) 2017-12-08 20:21:37 +08:00
api_admin_test.go Delete a user's public key via admin api (closes #3014) (#3059) 2017-12-06 12:27:10 +02:00
api_branch_test.go Use httptest in integration tests (#3080) 2017-12-04 00:46:01 +02:00
api_comment_test.go Fix comment API paths (#2813) 2017-11-20 15:24:07 +08:00
api_fork_test.go Fix repo API bug (#2133) 2017-07-12 03:23:41 +02:00
api_gpg_keys_test.go Use httptest in integration tests (#3080) 2017-12-04 00:46:01 +02:00
api_issue_label_test.go Fix tests code to prevent some runtime errors (#2381) 2017-08-28 12:17:45 +03:00
api_issue_test.go Less verbose integration tests (#2123) 2017-07-07 21:36:47 +02:00
api_keys_test.go Fix repo API bug (#2133) 2017-07-12 03:23:41 +02:00
api_pull_test.go Less verbose integration tests (#2123) 2017-07-07 21:36:47 +02:00
api_repo_lfs_locks_test.go Make test more robust (#3167) 2017-12-12 15:17:08 +08:00
api_repo_raw_test.go Fix API raw file content access for default branch (#2849) 2017-11-04 19:26:38 +02:00
api_repo_test.go Add search mode option to /api/repo/search (#2756) 2017-10-27 00:16:13 +03:00
api_team_test.go Less verbose integration tests (#2123) 2017-07-07 21:36:47 +02:00
bare_repo_test.go Fix bare-repo bugs (#2199) 2017-07-27 12:23:38 +03:00
benchmarks_test.go Add more bench (#3161) 2017-12-24 02:33:34 +02:00
branches_test.go Use httptest in integration tests (#3080) 2017-12-04 00:46:01 +02:00
change_default_branch_test.go Less verbose integration tests (#2123) 2017-07-07 21:36:47 +02:00
delete_user_test.go Add integration test for user deleting account (#2891) 2017-11-12 21:36:16 +08:00
editor_test.go Use httptest in integration tests (#3080) 2017-12-04 00:46:01 +02:00
explore_repos_test.go fix template error on explore repos (#2319) 2017-08-17 15:20:21 +03:00
git_test.go Improve LFS tests + fix lfs url refs + keep path upper/lowercase in db. (#3092) 2017-12-08 20:21:37 +08:00
html_helper.go Use httptest in integration tests (#3080) 2017-12-04 00:46:01 +02:00
integration_test.go Unit tests for routers/repo/issue_label (#3198) 2017-12-15 23:11:02 +02:00
internal_test.go Use httptest in integration tests (#3080) 2017-12-04 00:46:01 +02:00
issue_test.go Unit tests for routers/repo/issue_label (#3198) 2017-12-15 23:11:02 +02:00
links_test.go Unit tests for routers/repo/issue_label (#3198) 2017-12-15 23:11:02 +02:00
mysql.ini.tmpl Git LFS lock api (#2938) 2017-11-28 22:58:37 +02:00
pgsql.ini.tmpl Git LFS lock api (#2938) 2017-11-28 22:58:37 +02:00
pull_compare_test.go Responsive view (#2750) 2017-12-30 18:47:52 -06:00
pull_create_test.go Serve pull request .diff files (#3293) 2018-01-05 12:56:52 +02:00
pull_merge_test.go Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
release_test.go Unit tests for routers/repo/issue_label (#3198) 2017-12-15 23:11:02 +02:00
repo_activity_test.go Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
repo_branch_test.go Add more bench (#3161) 2017-12-24 02:33:34 +02:00
repo_commits_test.go Make URL scheme unambiguous (#2408) 2017-10-30 10:04:25 +08:00
repo_fork_test.go Use httptest in integration tests (#3080) 2017-12-04 00:46:01 +02:00
repo_migrate_test.go Add more bench (#3161) 2017-12-24 02:33:34 +02:00
repo_search_test.go Code/repo search (#2582) 2017-10-27 09:10:54 +03:00
repo_test.go Remove unit types commits and settings (#2161) 2017-07-17 10:04:43 +08:00
setting_test.go Make SHOW_USER_EMAIL also apply to profiles (#2258) 2017-08-17 17:08:03 +08:00
signin_test.go Add integration tests for signin (#2363) 2017-08-23 10:30:33 +03:00
signout_test.go Add integration test for logging out (#2892) 2017-11-11 23:29:07 -06:00
signup_test.go Less verbose integration tests (#2123) 2017-07-07 21:36:47 +02:00
sqlite.ini Git LFS lock api (#2938) 2017-11-28 22:58:37 +02:00
timetracking_test.go Unit tests for routers/repo/issue_label (#3198) 2017-12-15 23:11:02 +02:00
user_test.go Unit tests for routers/repo/issue_label (#3198) 2017-12-15 23:11:02 +02:00
version_test.go Update hard-coded version to 1.3.0-dev (#2390) 2017-10-12 14:40:42 +03:00
xss_test.go Fix username rendering bug (#2122) 2017-07-12 17:58:52 +03:00