summaryrefslogtreecommitdiffstats
path: root/integrations/pull_merge_test.go
Commit message (Collapse)AuthorAgeFilesLines
* Improve English grammar and consistency. (#3614)bugreport02018-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | * Start improving English grammar and consistency. * Apply review comments, push translation further. * Additional review changes; expand translation. * Undo team/organization change, further translation. * Add site administration; review comments; merge. * Update hardcoded branch protection string tests. * Update hardcoded branch deletion string test. * Update another hardcoded translation string test. * Add my nickname to the list of translators. * Implement @lafriks review comments. * Remove (now) unused branch deletion warnings. * Remove (now) unused branch deletion warnings.
* Fix escaping changed title in comments (#3530)Lauris BH2018-02-181-4/+4
| | | | | | | | * Fix escaping changed title in comments * Fix escaping of wiki page titile Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>
* Add Pull Request merge options - Ignore white-space for conflict checking, ↵Lauris BH2018-01-051-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Unit tests for routers/repo/issue_label (#3198)Ethan Koenig2017-12-151-2/+4
|
* Use httptest in integration tests (#3080)Ethan Koenig2017-12-041-2/+3
|
* Integration test for activity page (#2704)Lauris BH2017-10-161-2/+2
| | | | | | | | * Integration test for activity page * Small code refactoring for acitvity page * Move activity stats calculation logic to model
* Fix so that user can still fork his own repository to owned organizations ↵Lauris BH2017-10-151-2/+2
| | | | | | | | | | (#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
* Less verbose integration tests (#2123)Ethan Koenig2017-07-071-18/+9
| | | * Helper functions for intergration test boilerplate
* Improve integration test helper functions (#2049)Ethan Koenig2017-06-251-2/+0
| | | Set request headers in helper functions, and new helper for requests with string-formatted URLs
* Make branch deletion URL more like GitHub's, fixes #1397 (#1994)Lauris BH2017-06-211-0/+56
| | | | | | | | | | | | * 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
* fix golint error and rename func for suggestion. (#1997)Bo-Yi Wu2017-06-171-1/+1
| | | Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
* Consolidate boilerplate in integration tests (#1979)Ethan Koenig2017-06-171-10/+5
|
* Add integration test for pull-request merge (#1912)Mura Li2017-06-151-0/+53
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 20:09:35 +0000