Andrii Verbytskyi
|
5454c8e963
|
Merge pull request !2762 from rhodecode-enterprise-ce RCCE-255-unit-tests-fix
Changes from branch: RCCE 255 unit tests fix
|
2025-07-04 15:19:34 +00:00 |
|
ievgenii vdovenko
|
06f04bb900
|
fix: renames variable
|
2025-07-04 14:28:34 +02:00 |
|
ievgenii vdovenko
|
f9d7b95583
|
tests: adds tests for show/hide PR merge strategy based on VCS settings
|
2025-07-04 14:25:53 +02:00 |
|
ievgenii vdovenko
|
2bf0039a68
|
Merge remote-tracking branch 'origin/feature/RCCE-114_Ability-to-squash-all-commits-that-are-apart-of-a-merge-request-before-the-final-merge' into feature/RCCE-114_Ability-to-squash-all-commits-that-are-apart-of-a-merge-request-before-the-final-merge
# Conflicts:
# rhodecode/templates/pullrequests/pullrequest_merge_checks.mako
|
2025-07-04 12:39:41 +02:00 |
|
ievgenii vdovenko
|
3a81d746fb
|
tests: adds tests for squash functionality and new VCS setting
|
2025-07-04 12:38:37 +02:00 |
|
ievgenii vdovenko
|
29ef46a375
|
feature: adds default value for c.show_merge_strategy for svn
|
2025-07-04 12:38:37 +02:00 |
|
ievgenii vdovenko
|
bc4d85fcdb
|
feature: changes the log message
|
2025-07-04 12:38:37 +02:00 |
|
ievgenii vdovenko
|
89d2a6aa05
|
feature: add an option to the repo settings to disable/enable
strategy selector for a user in a pull request
|
2025-07-04 12:38:36 +02:00 |
|
ievgenii vdovenko
|
802e8a8119
|
feature: initial implementation of squash functionality for git and hg; no enable/disable settings option yet
|
2025-07-04 12:38:33 +02:00 |
|
ievgenii vdovenko
|
2de10ebfb2
|
tests: adds tests for squash functionality and new VCS setting
|
2025-07-04 12:26:30 +02:00 |
|
Andrii V
|
ccba66d025
|
tests: added unit tests
|
2025-07-04 12:12:39 +02:00 |
|
Andrii V
|
25292a6e92
|
slack: capitalized some titles, added branch info
|
2025-07-03 22:57:42 +02:00 |
|
Andrii V
|
89218cd110
|
add some tests ingored
|
2025-07-03 22:14:41 +02:00 |
|
Andrii V
|
2f627a31e8
|
Merge branch 'main' into RCCE-255-unit-tests-fix
|
2025-07-03 16:24:17 +02:00 |
|
Andrii V
|
5e3cc80c7b
|
Merge branch 'main' of ssh://code.rhodecode.com:3022/internal/rhodecode-enterprise-ce
|
2025-07-03 16:23:28 +02:00 |
|
Andrii V
|
80dae1fe7d
|
Merge branch 'stable'
|
2025-07-03 16:21:36 +02:00 |
|
Andrii V
|
7c551fd05f
|
Merge branch 'main' into RCCE-255-unit-tests-fix
|
2025-07-03 15:49:31 +02:00 |
|
Andrii V
|
c4ee2591f1
|
add new dev test command
|
2025-07-03 15:49:27 +02:00 |
|
Andrii Verbytskyi
|
33459d44be
|
Merge pull request !2761 from rhodecode-enterprise-ce feature/RCCE-217-checkbox-to-close-delete-source-branch-when-merging-PR
Changes from branch: Feature/RCCE 217 checkbox to close delete source branch when merging PR
|
2025-07-03 12:17:29 +00:00 |
|
ievgenii vdovenko
|
ab8e075dba
|
feature: adds default value for c.show_merge_strategy for svn
|
2025-07-03 13:47:40 +02:00 |
|
ievgenii vdovenko
|
8c7c09e49f
|
feature: changes the log message
|
2025-07-03 13:44:27 +02:00 |
|
ievgenii vdovenko
|
b561675bb4
|
feature: add an option to the repo settings to disable/enable
strategy selector for a user in a pull request
|
2025-07-03 13:39:16 +02:00 |
|
Andrii V
|
aad900b04e
|
docs: fix 5.6.1 version in release notes
|
2025-07-03 13:30:35 +02:00 |
|
ievgenii vdovenko
|
a3373c4a4f
|
feature: initial implementation of squash functionality for git and hg; no enable/disable settings option yet
|
2025-07-02 17:05:00 +02:00 |
|
Andrii V
|
67155ceff2
|
release(version-bump): 5.6.0 → 5.6.1
|
2025-07-01 18:57:25 +02:00 |
|
Andrii V
|
dcb0d0beb7
|
docs: Release notes for 5.6.1
|
2025-07-01 18:13:10 +02:00 |
|
Andrii V
|
0bd73dc4a9
|
tests: remote too many tests ignored
|
2025-07-01 17:52:24 +02:00 |
|
Andrii V
|
fd016987a3
|
tests: fix 1 more, issue with git directories config
|
2025-06-27 20:52:31 +02:00 |
|
Andrii Verbytskyi
|
ee01404eac
|
Merge pull request !2758 from rhodecode-enterprise-ce fix/RCCE-250-message-You-have-reached-maximum-number-of-users-doesnt-dismiss
fix: store value in the cookie file if a user decided to opt our from the warning/error messages
|
2025-06-26 18:02:13 +00:00 |
|
Andrii Verbytskyi
|
6fa7a269b8
|
Merge pull request !2759 from rhodecode-enterprise-ce feature/RCCE-251_Add-internal-api-field-that-indicates-if-repo-is-archived
feature: adds 'archived' field to internal api response
|
2025-06-26 18:01:10 +00:00 |
|
Andrii Verbytskyi
|
ff89650fc0
|
Merge pull request !2743 from rhodecode-enterprise-ce RCCE-247-group-permissions
fix: RCCE-247 branch permissions with user groups
|
2025-06-26 18:00:19 +00:00 |
|
ievgenii vdovenko
|
ae044f9f39
|
feature: changes merge massage in global settings
|
2025-06-26 14:47:44 +02:00 |
|
ievgenii vdovenko
|
c975c71b2e
|
feature: changes merge massage
|
2025-06-26 14:29:46 +02:00 |
|
ievgenii vdovenko
|
d63a60defe
|
feature: adds separate messages for git and hg
|
2025-06-26 14:23:28 +02:00 |
|
ievgenii vdovenko
|
1d1060d5ce
|
fix: migration fix
|
2025-06-26 13:57:05 +02:00 |
|
Andrii V
|
22e865578e
|
tests: fix 2 more, skip more related to elastic
|
2025-06-26 13:00:22 +02:00 |
|
ievgenii vdovenko
|
4f1abd8ffa
|
tests: cleanup tests, adds new test for updating close branch setting
|
2025-06-26 10:10:14 +02:00 |
|
ievgenii vdovenko
|
d042ef20ac
|
feature: renames migration file
|
2025-06-26 09:07:31 +02:00 |
|
Andrii V
|
7dc5b1bc0c
|
tests: skip search related tests for now, add new test commands and add pytest-xdist to run in parralel
|
2025-06-25 20:37:14 +02:00 |
|
Andrii V
|
9bbdde8d18
|
tests: fix 3 more unit-tests
|
2025-06-25 19:22:38 +02:00 |
|
Andrii V
|
e99780dea1
|
tests: fix 2 unit-tests
|
2025-06-25 19:08:37 +02:00 |
|
ievgenii vdovenko
|
e20686a760
|
feature: adds test global settings inherited
|
2025-06-25 18:07:58 +02:00 |
|
ievgenii vdovenko
|
fcec7f0bbc
|
feature: adds tests if a new checkbox is shown for CE and EE
|
2025-06-25 17:16:34 +02:00 |
|
ievgenii vdovenko
|
c591138dd0
|
feature: fixes test after refactoring
|
2025-06-25 15:29:53 +02:00 |
|
ievgenii vdovenko
|
83ca0d54f2
|
feature: adds test checking new pr settings flag, refactor tests
|
2025-06-25 14:04:22 +02:00 |
|
ievgenii vdovenko
|
034a34da3f
|
feature: fixes PullRequest DB model object
|
2025-06-25 12:44:35 +02:00 |
|
ievgenii vdovenko
|
edf6be86a1
|
feature: adds handling CE and EE versions
|
2025-06-25 10:52:12 +02:00 |
|
ievgenii vdovenko
|
b5c53fab64
|
feature: adds priority for PR settings
|
2025-06-25 10:32:20 +02:00 |
|
Andrii V
|
d5b62c6b22
|
docs: more images for azure saml plugin, new architecture diagram
|
2025-06-24 17:40:16 +02:00 |
|
ievgenii vdovenko
|
d137477baf
|
Merge remote-tracking branch 'origin/feature/RCCE-217-checkbox-to-close-delete-source-branch-when-merging-PR' into feature/RCCE-217-checkbox-to-close-delete-source-branch-when-merging-PR
|
2025-06-24 16:50:41 +02:00 |
|