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

39 commits

Author SHA1 Message Date
Marcin Kuzminski
57268f2564 merge-logic: improve merge failed because of conflicts message. 2017-01-19 14:04:19 +01:00
Marcin Kuzminski
82fd870fe4 merge-checks: added more detailed information about why merge is not possible. 
- information is stored inside .error_details now.
 2017-01-19 13:56:23 +01:00
Marcin Kuzminski
30637758d6 pull-requests: unified merge checks. 
- same logic is now used for API, pre-conditions on show, and checks on actual merge
- added checks into API because it was not validated
 2017-01-18 14:56:20 +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
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
Martin Bornhold
ba66c9ce61 subrepo: Add merge failure reason code ad message for subrepo merge conflicts. 2016-10-28 13:06:55 +02:00
Marcin Kuzminski
510f700051 pull-requests: moved the delete logic into the show view. 
- delete from pr view is more intuitive
- there was several support queries about beeing confused how to delete a pr
 2016-10-30 20:58:11 +01:00
Marcin Kuzminski
753d0ff478 pull-requests: redo my account pull request page with datagrid. Fixes #4297 
- consistent ui with per-repo pull-request page
- faster loading due to pagination
- enabled sorting of columns
 2016-11-01 08:58:57 +01:00
Martin Bornhold
e0af9069d6 pr: Rename update response flag success -> executed 
The name `success` may be misleading beacuse a skipped updated can be
interpreted as success or failure. The new name `executed` is clearer
because its only `True` if the update is really executed.
 2016-10-27 14:28:26 +02:00
Martin Bornhold
053382901e pr: Refactor PR update error message handling. 2016-10-27 13:55:58 +02:00
Martin Bornhold
0236ad15ca vcs: Deprecate generic missing commit merge error reason. 
There are two more specific error reasons (target/source ref missing)
which should be used instead.
 2016-10-27 12:50:59 +02:00
Martin Bornhold
667cf04058 pr: Catch errors if target or source reference are missing during commit update. #3950 2016-10-27 10:37:51 +02:00
Martin Bornhold
e7dd0a5526 pr: Return update response objects instead of tuples. 2016-10-27 10:36:55 +02:00
Martin Bornhold
b82c5febad pr: Add UpdateResponse data structure to hold response data when updating commits. 2016-10-27 10:33:55 +02:00
Martin Bornhold
83bfa216e3 pr: Add update status messages dict. 2016-10-27 10:24:33 +02:00
Martin Bornhold
0990dd0076 pr: Return proper merge response if target reference is missing. 2016-10-27 10:24:00 +02:00
Martin Bornhold
e9b40b0f19 pr: Move log statement to allow early return and still log merge response. 2016-10-27 10:22:54 +02:00
Martin Bornhold
0191964cfd pr: Add error messages for new merge failure reasons. 2016-10-26 15:43:44 +02:00
Martin Bornhold
ff69018a3e pr-shadow: Adapt to new merge response object. 2016-10-23 16:03:46 +02:00
Martin Bornhold
ccc011226b pr-model: Commit changes to DB on merge status update. 2016-10-23 14:37:47 +02:00
Martin Bornhold
797d70d4cf pr-shadow: Set last merge revision on merge status update. 2016-10-23 14:37:19 +02:00
Martin Bornhold
26cc77cb77 pr-shadow: Copy last merge revision if creating a PR version. 2016-10-23 14:36:43 +02:00
Martin Bornhold
0e6b983ce1 shadow: Remove URL quoting of shadow repository pull URL. 2016-09-28 12:04:36 +02:00
Martin Bornhold
a385c08a46 pr: Unify clone url generation of shadow repository. 2016-09-21 09:34:47 +02:00
Martin Bornhold
3a69737da4 pr: Display link to shadow repository on pull request page. 2016-09-20 18:08:40 +02:00
Daniel Dourvaris
b3e97c1715 reviewers: store reviewer reasons to database, fixes #4238 2016-09-27 02:34:15 +03:00
Martin Bornhold
3315d7ca11 pr: Use unicode object when generating the pull request title 2016-09-22 13:27:40 +02:00
Martin Bornhold
e61c84a72e config: Use hooks protocol and direc calls seting from vcs settings module. 2016-08-08 08:29:35 +02:00
Marcin Kuzminski
1b62606fc2 emails: added new tags to status sent 
- make this distinct colored tags for quick status catch
- pass in the status type together with label to the notifiactions and templates
- fixed some UI issues on emails
 2016-08-03 15:21:38 +02:00
Daniel Dourvaris
f81ae45597 slack: fix links in commit/pr events 2016-07-11 17:57:34 +02:00
Daniel Dourvaris
c1b109c7a0 events: fix bug, 'url' was not in dict 2016-07-07 05:35:54 +03:00
Daniel Dourvaris
597b9b24d7 events: fix bugs with serialization of repo/pr events and add tests for those cases 2016-07-07 04:31:17 +03:00
Daniel Dourvaris
23d7a947f5 events: add serialization .to_dict() to events based on marshmallow 2016-07-06 12:21:03 +03:00
Martin Bornhold
b545575d28 settings: Read 'rebase-merge' config option and pass it to the VCS insntacen on merge. 2016-06-27 13:17:41 +02:00
Johannes Bornhold
ebec853ea6 pull_request: Increase debug logging around merge. 2016-06-09 00:19:16 +02:00
Johannes Bornhold
6b65e5d1d4 pull_request: Add debug logging around merge status calculation 
Goal is to see better traces of the business logic when trying to find out if a
pull request can be merged or not.
 2016-06-08 23:26:02 +02:00
Daniel Dourvaris
a31dc2a19e pullrequests: select a ref if one exists matching the commit id 2016-05-24 19:21:56 +03:00
Marcin Kuzminski
9a0d8c0b77 project: added all source files and assets 2016-05-24 15:56:53 +02:00