engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4466 commits 1 branch 0 tags 110 MiB
Commit graph

128 commits

Author SHA1 Message Date
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
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
61e0b7b961 pull-requests: increase stability of concurrent pull requests creation by flushing prematurly the statuses of commits. 
This is required to increase the versions on each concurrent call. Otherwise we could get into an integrity errors of commitsha+version+repo
 2019-01-04 13:00:21 +01:00
Marcin Kuzminski
bd1a9c8201 docs: updated copyrights to 2019 2019-01-02 18:13:27 +01:00
Marcin Kuzminski
861720334b release: merge back stable branch into default 2019-01-02 17:04:25 +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
Marcin Kuzminski
1d027eb16a pull-requests: validate ref types for pull request so users cannot provide wrongs ones. 2018-12-13 22:02:46 +01:00
Marcin Kuzminski
0cc2c2c07d code: code cleanups, use is None instead of == None. 2018-11-21 18:05:27 +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
1f39d62f74 comments: use proper auth user for close PR action. 2018-09-18 09:49:18 +02:00
Marcin Kuzminski
6458ef9105 pull-requests: add merge validation to prevent merges to protected branches. 2018-08-28 20:24:40 +02:00
Marcin Kuzminski
5f656f5671 default-reviewers: fixed voting rule calculation on user-group. The previous 
logic took user group even for individual users, thus voting on group wasn't correct
in case of mixed single reviewers + user groups.
 2018-08-17 09:12:28 +02:00
Marcin Kuzminski
099f68a724 pull-requests: make the renderer stored and saved for each pull requests. 
- gives backward compatability with previous versions which didn't set renderer
- allows versioning of renderer changes
 2018-07-17 14:45:29 +02:00
Marcin Kuzminski
79dce74e8a api: fix creation of PR with default reviewer rules. 2018-07-10 18:25:22 +02:00
Marcin Kuzminski
225757aaf3 hooks: made the callback host configurable. 
- This allows easier docker container seperation
 2018-07-03 11:57:03 +02:00