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

106 commits

Author SHA1 Message Date
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
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
b058fefee1 audit-logs: use auth_user in few places to track action IP. 2018-06-12 18:29:54 +02:00
Marcin Kuzminski
9335656019 pull-requests: fix problem with long DB transaction and row-locking. 
fixes #5470
 2018-06-11 15:35:54 +02:00
Marcin Kuzminski
71b80f5eeb pull-reqeusts: added option to force-refresh merge workspace in case of problems. 2018-06-05 10:17:16 +02:00
Marcin Kuzminski
0fdbc4a78f events: expose shadow repo build url. 2018-02-15 23:24:23 +01: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
f6063fb031 pull-requests: don't select first commit in case we don't get default branch. Loading 
compare from commit 0 to something selected is very heavy to compute. Instead force
user to select the ref manually. ref #5414
 2018-01-15 21:08:23 +01:00
Marcin Kuzminski
d39b41b81a pull-requests: add link to switch base based on the target. 2018-01-03 21:31:43 +01:00
Marcin Kuzminski
f0142981ea pull-requests: moved get_pr_version into PullRequestModel. 2017-11-23 20:06:43 +01:00
Marcin Kuzminski
6d8d44653d pull-requests: forbid doing any changes on closed pull-requests. 
- this is forbidden in the UI however we also need to prevent backend calls
 2017-11-20 17:02:12 +01:00
Marcin Lulek
b95942a08c pull-requests: security, prevent from injecting comments to other pull requests users 
don't have access to.
 2017-10-19 08:56:32 +02:00
Marcin Kuzminski
27aff1de7a pull-requests: trigger merge simulation during PR creation. Fixes #5396 2017-10-12 20:57:02 +02:00
Marcin Kuzminski
56bbe6261a pull-request-events: add audit data for pull_request.close action 2017-09-08 16:04:22 +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
Mathieu Cantin
761e973359 mercurial: Add option to close a branch before merging 2017-08-08 13:46:42 -04:00
Marcin Kuzminski
57031945a3 pull-requests: use merge info to show how Pull requests will be merged. 
- rebase or merge commit is shown as merge strategy.
- close/delete branch are shown if that option is selected.
 2017-08-23 13:48:10 +02:00
Marcin Kuzminski
b203d5f208 pull-requests: migrated code from pylons to pyramid 2017-07-27 11:30:55 +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 Lulek
af07c911dc security: use safe escaped version of description for repo and repo group to potentially 
prevent any XSS attacks on returned data.
 2017-06-21 12:23:46 +02:00
Marcin Lulek
ad54b9a57d security: use new safe escaped user attributes across the application. 
- will fix all possible XSS attack vectors.
 2017-06-19 15:14:02 +02:00
Marcin Kuzminski
aa3bffd198 pull-requests: prepare the migration of pull request to pyramid. 
- this is half the code because of problems found during porting
- partially moved the urls, and flipped the logic into pyramid code
- needs more work in core for full switch.
 2017-06-19 13:25:15 +02:00