Commit graph

47 commits

Author SHA1 Message Date
RhodeCode Admin
3a64e09b7b tests: fixed some tests 2021-07-16 16:23:02 +02:00
Marcin Kuzminski
c3f059ebc6 observers: code cleanups and fixed tests. 2020-10-11 22:16:08 +02:00
Marcin Kuzminski
9106e99baf pull-requests: added observers, and fix few problems with versioned comments 2020-08-21 20:56:59 +02:00
Marcin Kuzminski
fe96e16646 code: update copyrights to 2020 2020-04-16 00:34:52 +02:00
Marcin Kuzminski
4de6dd537c pull-requests: fixed case for GIT repositories when a merge check failed due to merge conflicts the pull request wrongly reported missing commits.
- we're now searching for dangling commits in a repo that has them and cannot see them because of failed merge checks.
- pull-request: will save metadata during merge simulation so merge conflicts are permanently stored, and showed to all users.
2020-04-08 11:17:10 +02:00
Marcin Kuzminski
03b4b5ba7b pull-requests: added update pull-requests email+notifications
- fixed generated update message comments + invalid anchor linkes generated to the changed files
- unified headers on all email messages for pull requests
2019-12-04 20:58:23 +01:00
Marcin Lulek
f069e0f0f9 pull-requests: add merge check that detects WIP marker in title. This will prevent merges in such case.
Usually WIP in title means unfinished task that needs still some work.

This pattern is present in Gitlab/Github and is already quite common.
2019-11-25 19:10:53 +01:00
Marcin Kuzminski
1eb782ad15 pull-requests: expose unresolved files in merge response. 2019-11-15 01:00:13 +01:00
Daniel Dourvaris
836aa041be pull-requests: change the naming from #NUM into !NUM.
- We'll later on enable global pattern matching and from now on refercing a pr should be
used with an ! not to confuse #NUM which is tickets/issues
2019-11-06 12:24:42 +01:00
Marcin Kuzminski
3876870e28 tests: stabilize tests for mysql/postgres. 2019-10-08 17:06:35 +02:00
Marcin Kuzminski
1d9452ce80 pytest: use consistent way of creating a fixture by using pytest.fixture() 2019-09-28 23:04:18 +02:00
Marcin Kuzminski
0215f5278c pull-requests: updated metadata information for failed merges with multiple heads. 2019-04-09 13:12:26 +02:00
Marcin Kuzminski
efc39f31eb events: trigger 'review_status_change' when reviewers are updated.
- small code refactoring
- extended commenting event with comment
- extended review_status_change event with new status
2019-01-18 13:16:34 +01:00
Marcin Kuzminski
1e2a7a9136 pull-requests: introduce operation state for pull requests to prevent from
locks during merge/update operations.
2019-01-07 13:32:16 +01:00
Marcin Kuzminski
bd1a9c8201 docs: updated copyrights to 2019 2019-01-02 18:13:27 +01:00
Daniel Dourvaris
599f9b7964 pull-requests: ensure merge response provide more details
- refactor merge responses with detailed messages
- fixes #5520
- code cleanups
2018-12-30 11:00:09 +01:00
Daniel Dourvaris
94d74336d1 diffs: introducing diff menu for whitespace toggle and context changes 2018-10-23 17:02:26 +02:00
Marcin Kuzminski
175a9b344e rcextensions: new builtin rcextensions.
- ability to expose output to users from rcextensions
- new docs
- linking to the code makes the tests always check the integrity of rcextensions
- added new hook variables and described them to end users
2018-10-23 11:45:45 +02:00
Marcin Kuzminski
4da7905b37 vcs: use a real two part name for merge operation.
- expose settings into vcs_settings for easier override later
2018-10-01 13:54:51 +02:00
Marcin Kuzminski
3a43ded6b6 hooks: pass in store_path into env for hooks. 2018-09-26 12:14:37 +02:00
Marcin Kuzminski
42c80fe075 shadow-repos: use numeric repo id for creation of shadow repos.
- Fixes a problem after rename or move into repository group.
2018-06-21 14:04:06 +02:00
Marcin Kuzminski
00b45c1fa7 release: update copyright year to 2018 2018-01-19 17:13:16 +01:00
Marcin Kuzminski
6f2703e4af default-reviewers: introduce new voting rule logic that allows
defining vote rules for user groups assigned to the default reviewers.

- allows to set per number votes on user groups
- group reviewers by groups
- store the rules and show them in the UI
- fixes #5409
2018-01-19 12:38:25 +01:00
Marcin Kuzminski
19744d8230 vcs-ops: store user_id inside the extras for vcs context operations.
- we'll use this one for bootstrap of async tasks.
2017-11-30 17:41:05 +01:00
Marcin Kuzminski
1d332c03ad pylons: fixed code and test suite after removal of pylons. 2017-11-16 18:27:09 +01:00
Marcin Kuzminski
5f9ae2ae11 pylons: remove pylons as dependency
- dependencies: bumped:
 -setuptools-scm==1.15.6
 -celery==4.1.0
 -kombu==4.1.0
 -pytz==2017.3
 -Routes==2.4.1

Removed all pylons components. Refactored the code to use only pyramid
parts
2017-11-15 13:42:54 +01:00
Marcin Kuzminski
27aff1de7a pull-requests: trigger merge simulation during PR creation. Fixes #5396 2017-10-12 20:57:02 +02:00
Marcin Kuzminski
990994942d pull-requests: use close action with proper --close-commit solution.
- Mercurial settings are no long as LABS
- Unified some code between GIT and HG on rebase/close/delete feature branches
2017-08-24 22:36:34 +02:00
Marcin Kuzminski
ae8340ad2a db: use a wrapper on pull requests _last_merge_status to ensure this is always INT.
- after upgrade of sqlalchemy this is casted to Long
- for backward compat we cast it as Int
2017-07-26 12:16:25 +02:00
Marcin Kuzminski
926a79e98e audit-logs: implemented pull request and comment events. 2017-06-17 15:22:50 +02:00
Marcin Kuzminski
71fee00277 home: moved home and repo group views into pyramid.
- fixed lots of tests related to those changes
- now main and subrepo group views are handled by pyramid.
2017-06-05 15:16:04 +02:00
Marcin Kuzminski
bd1e865c9c pull-request: extended default reviewers functionality.
- added mandatory reviewers JS logic Fixes: #4219
- added option to forbid author to be a reviewer via JS/Frontend checks. Fixes #5190
- added option to forbid adding new reviewers except those defined. Fixes #5208
2017-05-29 20:10:17 +02:00
Marcin Kuzminski
3d3f2db34a core: removed pyro4 from Enterprise code. Fixes #5198 2017-02-07 15:58:49 +01:00
Marcin Kuzminski
23ff2e2325 test: fixes for tests for PR versions. 2017-01-30 12:41:24 +01:00
Marcin Kuzminski
57268f2564 merge-logic: improve merge failed because of conflicts message. 2017-01-19 14:04:19 +01:00
Marcin Kuzminski
b52808ca95 comments: renamed ChangesetCommentsModel to CommentsModel to reflect what it actually does.
It's not limited to Changesets/Commits.
2017-01-09 17:52:00 +01:00
Marcin Kuzminski
fcc027c282 license: updated copyright year to 2017 2017-01-02 09:30:39 +01:00
Marcin Kuzminski
9d8634a618 pull-requests: expose version browsing of pull requests.
- show nav for browsing each version of pr
- show detailed changes for each of version
- update comment template to indicate the changes were due to update of a pr
2016-12-19 17:38:22 +01:00
Marcin Kuzminski
d6f28d246d pull-requests: when creating a new version set the created_date to now instead of
coping it from original object.
2016-12-06 00:19:29 +01:00
Marcin Kuzminski
1d37334326 inline-comments: added helper to properly count inline comments. 2016-12-06 00:18:07 +01:00
Martin Bornhold
00e5b996a5 tests: Use merge reference object instead of raw commit id. 2016-10-24 10:13:29 +02:00
Martin Bornhold
2a64079089 tests: Add missing key/value to vcs operation dummy dict. 2016-09-23 14:17:04 +02:00
Daniel Dourvaris
b3e97c1715 reviewers: store reviewer reasons to database, fixes #4238 2016-09-27 02:34:15 +03:00
Martin Bornhold
62f27a2f43 tests: Add a test that checks return type of pr title generate function. (has to be unicode) 2016-09-26 08:53:31 +02:00
Martin Bornhold
a26deb916c tests: Add missing argument to assert_called_with statements.
Added the `'use_rebase' argument to assert statements which was recently
added to the merge method.
2016-07-08 09:15:03 +02:00
Daniel Dourvaris
9727a3880f events: add event system for RepoEvents 2016-07-06 06:00:18 +03:00
Marcin Kuzminski
9a0d8c0b77 project: added all source files and assets 2016-05-24 15:56:53 +02:00