Commit graph

144 commits

Author SHA1 Message Date
RhodeCode Admin
952b2b0cdc pull-requests: fix potential crash on providing a wrong order-by type column. 2021-07-19 11:53:32 +02:00
RhodeCode Admin
0d36e58be5 pull-requests: optimize db transaction logic.
- we've been investigating this issue with locked pull-requests
- the transactions arround audit-logs and state-lock seems to be fragile for long-running, and exception prone setups
- this change tries to make use of few snapshot transactions to prevent a long ones, and actually try to recover on failed audit-log calls.
2021-07-15 15:05:16 +02:00
RhodeCode Admin
aded27dc31 pull-requests: added awaiting my review filter for users pull-requests.
- additionally the awaiting my review now properly filters pull requests that have no review votes on them
2021-04-20 12:59:31 +02:00
Milka Kuzminski
2cc353de2c backends: use reference explicitly to properly translate GIT references to commits such as numeric branches 2021-03-16 23:18:52 +01:00
Milka Kuzminski
9c33519fcc pull-requests: expose commit versions in the pull-request commit list. Fixes #5642 2020-12-29 08:48:26 +01:00
Milka Kuzminski
a48329f4be reviewers: only require a review when we have reviewers defined.
- use case is that pr can be created without review needed, maybe just for sharing, or CI checks
2020-11-13 11:31:29 +01:00
Milka Kuzminski
6cf496d104 notifications: skip double rendering just to generate email title/desc 2020-11-11 22:44:38 +01:00
Marcin Kuzminski
c3f059ebc6 observers: code cleanups and fixed tests. 2020-10-11 22:16:08 +02:00
Marcin Kuzminski
b5f86e3b64 pull-requests: fixed creation of pr after new serialized commits data. 2020-10-09 09:39:27 +02:00
Marcin Kuzminski
16678eb0f8 reviewers: use common function to obtain reviewers with filter of role. 2020-10-08 14:10:11 +02:00
Marcin Kuzminski
0bbae6c416 pull-requests: only allow actual reviewers to leave status/votes.
Other participants aren't allowed that, they could only sent text comments
to not distract from actual votes that count towards the overall review.
2020-10-08 13:46:33 +02:00
Marcin Kuzminski
508c8ba158 reviewers: optimize diff data, and creation of PR with advanced default reviewers 2020-10-08 12:01:18 +02:00
Marcin Kuzminski
e78b5fc1ee pull-requests: limit the ammount of data saved in default reviewers data for better memory usage
- fixes #5633
2020-10-07 11:26:24 +02:00
Marcin Kuzminski
d724630710 default-reviewers: diff data should load more things lazy for better performance. 2020-10-06 14:32:24 +02:00
Marcin Kuzminski
80da773011 reviewers: added observers as another way to define reviewers.
- fixes #4183
2020-10-06 08:49:13 +02:00
Marcin Kuzminski
8bd65513e6 pull-requests: properly save merge failure metadata. Before this change
when reference errors were saved the de-serialization lost some of the
attributes resulting in bad formatting of merge failure messages.
2020-08-03 11:15:04 +02:00
Marcin Kuzminski
50d91914f5 emails: set References header for threading in mail user agents even with different subjects
- drop template headers() function as it wasn't used, and actually had bad implementation
2020-07-15 21:37:03 +02:00
Marcin Kuzminski
74e96ea4b4 comments: added new events for comment editing to handle them in integrations. 2020-07-13 11:18:28 +02:00
Marcin Kuzminski
3ca5ca1105 pull-requests: changed the order of close-branch after merge, so we don't leave open heads.
Branches will be closed, and then merged based on the close commit. This is a proper and recommended
workflow for feature branches and close option.
2020-07-09 13:09:14 +02:00
Marcin Kuzminski
8e312294e7 default-reviewers: fixed problems with new diff format for more advanced default reviewer rules. 2020-06-12 22:14:48 +02:00
Daniel Dourvaris
03f066ce9a users: added option to detach pull requests for users which we delete.
- as bonus added ability to specify new owner via ?detach_user_id=NUM GET param.
2020-05-20 12:33:43 +02:00
Marcin Kuzminski
293a3535ae pull-requests: fix way how pull-request calculates common ancestors.
- fixes #5561
- added new preview for size (commits/files) of PRs before opening, this is now based on the special logic that calculates common ancestor and has access to preview diff
- store common ancestor in DB so updates of pull-requests are consistent
2020-05-08 08:43:51 +02:00
Marcin Kuzminski
72820d2808 pull-requests: allow filter by author 2020-04-24 11:51:37 +02:00
Marcin Lulek
e3169ab897 pull-requests: added filters to my account pull requests page. 2020-04-22 11:10:46 +02:00
Daniel Dourvaris
fcd530ecfe pull-requests: add information about changes in source repositories in pull-request show page.
- fixes #5611
2020-04-21 21:50:36 +02:00
Marcin Kuzminski
fe96e16646 code: update copyrights to 2020 2020-04-16 00:34:52 +02:00
Daniel Dourvaris
466826a84a hooks: added new hooks for comments on pull requests and commits.
- allows writing custom actions on top of comments
- new rcextension hooks
- organized and renamed some hooks
- new helpers for rcextensions
- fixes #5583
2020-04-15 18:00:59 +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
d77223bd2e pull-requests: small code cleanup to define other type of merge username
- possible to specify alternative attr using env option: RC_MERGE_USER_NAME_ATTR
2020-01-10 17:11:43 +01:00
Marcin Kuzminski
20af3498fa pull-requests: handle case when removing existing files from a repository in versioning diff. 2019-12-06 12:30:54 +01: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
Marcin Kuzminski
ecebee8eeb pull-requests: added quick filter to grid view. 2019-11-09 00:06:28 +01:00
Daniel Dourvaris
453a6ee9a2 emails: updated emails design and data structure they provide.
- more consistent UI for emails
- nicer formatting, plaintext emails
- major cleanup and fixes lots of incosistencies
- additionally debug-style now allows to test emails in browser for faster development
2019-11-05 19:07:09 +01:00
Marcin Kuzminski
3e5a351479 pull-requests: handle exceptions in state change and improve logging. 2019-09-10 15:28:20 +02:00
Daniel Dourvaris
a6a1f6694a pull-requests: add indication of state change in list of pull-requests and actually show them in the list. 2019-07-23 14:25:33 +02:00
Marcin Kuzminski
cab16efa4e vcs: optimized pre-load attributes for better caching. 2019-07-17 13:50:26 +02:00
Marcin Kuzminski
6a2e2f0b94 commits: re-implemented fetching a single commit for git case.
- faster using always cache if available
- fixed problems after changes of __bool__ of repo object which always rebuilt cache and this is not the case now
- make few error messages better
2019-06-10 12:28:47 +02:00
Marcin Kuzminski
23584a96ce tests: fix cache problems after empty repo check change. 2019-06-06 20:24:25 +02:00
Marcin Kuzminski
30739c0afa pull-request: calculate ancestor in the same way as creation mode ! 2019-06-03 20:00:45 +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
8920170d1d release: merge back stable branch into default 2019-04-02 22:28:08 +02:00
Marcin Kuzminski
a2bca9c304 pull-requests: fixed a bug in removal of multiple reviewers 2019-03-26 13:58:45 +01:00
Marcin Kuzminski
69ea375e9d pull-requests: expose force refresh of merge workspace and expose all metadata for merge message formatting. 2019-03-22 16:39:11 +01:00
Marcin Kuzminski
84383cd557 pull-requests: handle non-ascii branches from short branch selector via URL 2019-02-26 09:25:26 +01:00
Marcin Kuzminski
bd69124334 api: pull-requests get_all now sortes the results and have a flag to show/hide merge result state 2019-01-31 14:42:23 +01:00
Marcin Kuzminski
6e8560f3a5 comments: expose a function to fetch unresolved TODOs for repository 2019-01-25 14:19:30 +01:00
Daniel Dourvaris
96fa4e0bdc py3: remove usage of basestring 2019-01-22 23:06:49 +01: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