summaryrefslogtreecommitdiffstats
path: root/integrations/pull_merge_test.go
Commit message (Collapse)AuthorAgeFilesLines
* CSS color variables, less bold font weight and more (#13567)silverwind2020-11-151-1/+1
| | | | | | | | | | | | | | | | | * CSS color variables, less bold font weight - Define color variables for fully saturated colors and apply them where it made sense - Add background color helper classes - Globally reduce bold font weight from 700 to 500 - Remove border from timeline icons - Unify dropzone styling - Various border style consolidations * attempt to fix test * another attempt at tests * fix contains
* Fix styling for PR merge section when no checks (#11609)Cirno the Strongest2020-05-251-1/+1
| | | Makes styling consistent between two cases. Also removed unnecessary double border.
* Prettify Timeline (#10972)Sorien2020-04-111-1/+1
| | | Co-authored-by: mrsdizzie <info@mrsdizzie.com>
* Only check for conflicts/merging if the PR has not been merged in the ↵zeripath2020-02-101-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interim (#10132) * Only check for merging if the PR has not been merged in the interim * fixup! Only check for merging if the PR has not been merged in the interim * Try to fix test failure * Use PR2 not PR1 in tests as PR1 merges automatically * return already merged error * enforce locking * enforce locking - fix-test * enforce locking - fix-testx2 * enforce locking - fix-testx3 * move pullrequest checking to after merge This might improve the chance that the race does not affect us but does not prevent it. * Remove minor race with getting merge commit id * fixup * move check pr after merge * Remove unnecessary prepareTestEnv - onGiteaRun does this for us * Add information about when merging occuring * fix fmt * More logging * Attempt to fix mysql * Try MySQL fix again * try again * Try again?! * Try again?! * Sigh * remove the count - perhaps that will help * next remove the update id * next remove the update id - make it updated_unix instead * On failure to merge ensure that the pr is rechecked for conflict errors * On failure to merge ensure that the pr is rechecked for conflict errors * Update models/pull.go * Update models/pull.go Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> * Apply suggestions from code review Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Fix "data race" in testlogger (#9159)zeripath2019-11-261-6/+6
| | | | | | * Fix data race in testlogger * Update git_helper_for_declarative_test.go
* Adjust error reporting from merge failures and use LC_ALL=C for git (#8548)zeripath2019-11-101-0/+137
| | | | | | There are two major components to this PR: * This PR handles merge and rebase failures from merging a little more nicely with Flash errors rather a 500. * All git commands are run in the LC_ALL="C" environment to ensure that error messages are in English. This DefaultLocale is defined in a way that if necessary (due to platform weirdness) it can be overridden at build time using LDFLAGS="-X "code.gitea.io/gitea/modules/git.DefaultLocale=C"" with C changed for the locale as necessary.
* Use gitea forked macaron (#7933)Tamal Saha2019-08-231-1/+1
| | | Signed-off-by: Tamal Saha <tamal@appscode.com>
* Fix duplicate call of webhook (#7821)Antoine GIRARD2019-08-111-0/+34
|
* fix pull view ui merge section (#7335)Lunny Xiao2019-07-011-1/+1
| | | | | | | | * fix pull view ui merge section * fix tests * fix tests
* Add commit statuses reports on pull request view (#6845)Lunny Xiao2019-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add commit statuses reports on pull view * Add some translations * improve the UI * fix fmt * fix tests * add a new test git repo to fix tests * fix bug when headRepo or headBranch missing * fix tests * fix tests * fix consistency * fix tests * fix tests * change the test repo * fix tests * fix tests * fix migration * keep db size consistency * fix translation * change commit hash status table unique index * remove unused table * use char instead varchar * make hashCommitStatusContext private * split merge section with status check on pull view ui * fix tests; fix arc-green theme on pull ui
* Remove local clones & make hooks run on merge/edit/upload (#6672)zeripath2019-05-111-75/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add options to git.Clone to make it more capable * Begin the process of removing the local copy and tidy up * Remove Wiki LocalCopy Checkouts * Remove the last LocalRepo helpers * Remove WithTemporaryFile * Enable push-hooks for these routes * Ensure tests cope with hooks Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove Repository.LocalCopyPath() * Move temporary repo to use the standard temporary path * Fix the tests Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove LocalWikiPath * Fix missing remove Signed-off-by: Andrew Thornton <art27@cantab.net> * Use AppURL for Oauth user link (#6894) * Use AppURL for Oauth user link Fix #6843 * Update oauth.go * Update oauth.go * internal/ssh: ignore env command totally (#6825) * ssh: ignore env command totally * Remove commented code Needed fix described in issue #6889 * Escape the commit message on issues update and title in telegram hook (#6901) * update sdk to latest (#6903) * improve description of branch protection (fix #6886) (#6906) The branch protection description text were not quite accurate. * Fix logging documentation (#6904) * ENABLE_MACARON_REDIRECT should be REDIRECT_MACARON_LOG * Allow DISABLE_ROUTER_LOG to be set in the [log] section * [skip ci] Updated translations via Crowdin * Move sdk structs to modules/structs (#6905) * move sdk structs to moduels/structs * fix tests * fix fmt * fix swagger * fix vendor
* Add rebase with merge commit merge style (#3844) (#4052)Julian2018-12-271-0/+13
| | | Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
* Disable merging a WIP Pull request (#4529)Julien Tant2018-08-131-0/+21
| | | | | | | | | | | | | | | | | * prevent pull request to be merged when PR is a WIP * add tests * add helper to prepend WIP: in PR title * move default wip prefixes into settings * use configurable WIP prefixes in javascript and default to first one in templates * add documentation * add unit test on pull model Signed-off-by: Julien Tant <julien@craftyx.fr>
* 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 2024-12-26 15:27:52 +0000