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

1083 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
66a336156c vcs: Use more specific merge error reason (either target or source ref missing) 2016-10-27 12:50:02 +02:00
Martin Bornhold
6ea00dcc6d tests: Add test to check PR page when target reference is missing. 
The pr page should display the desired error message to the user.
 2016-10-27 11:44:45 +02:00
Martin Bornhold
9bc3e546a4 tests: Fix test by using flash message text from model. 2016-10-27 11:43:57 +02:00
Martin Bornhold
22dde6518a tests: Adapt tests to return value change. 2016-10-27 11:43:13 +02:00
Martin Bornhold
ef2d6c6086 pr: Use new update response object from pr model. #3950 2016-10-27 10:40:32 +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
66c56a50d1 vcs: Add enumeration for pull request update failure reasons. 2016-10-27 10:21:33 +02:00
Martin Bornhold
0191964cfd pr: Add error messages for new merge failure reasons. 2016-10-26 15:43:44 +02:00
Martin Bornhold
d67cf6eb19 vcs: Add merge failure reasons for missing target ref and missing source ref. 2016-10-26 15:43:03 +02:00
Martin Bornhold
d8c91886ac login: Add some tests to check captcha setting retrieval. #4279 2016-10-26 14:56:47 +02:00
Martin Bornhold
4be36d3722 login: Make register views more robust if some POST parameters are missing. 
We fail to delete passsword/password confirm parameters if they are not
part of the POST parameters. But failing to delete them if they are not
present seems wrong. Better silently ignore if they are not present.
 2016-10-26 14:55:33 +02:00
Martin Bornhold
ecdcd650d5 login: Start error message with uppercase letter. 
All other error messages are starting with uppercase and
lowercase just looks wrong in the UI
 2016-10-26 13:19:56 +02:00
Martin Bornhold
ae6d9307d4 login: Removed superfluos if condition. 2016-10-26 13:17:54 +02:00
Martin Bornhold
e400104b67 login: Fix recaptcha. #4279 
There was an error in the retrieval of private/public key from settings model.
This leads to `None` as private key and this indicates that recaptcha
is not active. Therefore it was never used no matter if private key
was set or not.
 2016-10-26 13:18:30 +02:00
Martin Bornhold
fe6df6dda5 db-migration: Add a column to the PullRequest and PullRequestVersion table. 
The column holds the value of the shadow repo merge reference.
 2016-10-25 10:01:29 +02:00
Martin Bornhold
6bb188f742 tests: Ignore merge commit id on camparison of merge responses. 2016-10-25 10:23:38 +02:00
Martin Bornhold
80dde63a91 tests: Adapt asserts to work with merge reference onbject in merge response. 2016-10-24 10:14:42 +02:00
Martin Bornhold
00e5b996a5 tests: Use merge reference object instead of raw commit id. 2016-10-24 10:13:29 +02:00
Martin Bornhold
406ee8a847 tests: Remove pull request duplication and update expected values. 2016-10-24 10:12:32 +02:00
Martin Bornhold
435dbe2865 tests: Update expected data from api call. 2016-10-24 10:10:26 +02:00
Martin Bornhold
30ddfedded api: Add merge reference to merge_pull_request api call. 2016-10-24 10:09:44 +02:00
Martin Bornhold
979006718e api: Include merge reference into API data of a PR. 2016-10-23 16:48:32 +02:00
Martin Bornhold
7c33907e21 tests: Adapt tests to new merge response object. 2016-10-23 16:04:07 +02:00
Martin Bornhold
ff69018a3e pr-shadow: Adapt to new merge response object. 2016-10-23 16:03:46 +02:00
Martin Bornhold
929f1ab661 vcs: Return merge reference in merge response. 
Previously we returned only the merge commit id. Now we set a bookmark(hg)
or branch reference(git) to point to the merge commit. By returning a
merge reference we have both informations available (id and name)
 2016-10-23 16:02:41 +02:00
Martin Bornhold
d6e0fb2739 pep8: Remove unused imports and variables. 2016-10-23 16:00:16 +02:00
Martin Bornhold
60effdade9 pr-shadow: Use reference object to store the last merge reference of a PR. #1055 2016-10-23 15:58:19 +02:00
Martin Bornhold
b7baca777d db: Refactor reference conversion to an reusable method. 2016-10-23 15:57:24 +02:00
Martin Bornhold
c576b1e5e2 tests: Add test to check the link to the shadow repo of a PR. 2016-10-23 14:39:53 +02:00
Martin Bornhold
06be9538a1 tests: Add a method to AssertResponse to check value of elements. 2016-10-23 14:39:26 +02:00
Martin Bornhold
7dfbea5041 pr-shadow: Display link to last merge revision in shadow repository if merge was successful. #1055 2016-10-23 14:38:52 +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
5eb2bcdc45 db: Add a column to PR to hold the last merge revision. 2016-10-23 14:35:47 +02:00
Martin Bornhold
c4c2b23087 pr-shadow: Set bookmark in hg repositories on successful merge. #1055 2016-10-23 14:34:15 +02:00
Martin Bornhold
939cf321a7 pr-shadow: Set reference in git shadow repositories on successful merge. #1055 2016-10-23 14:33:45 +02:00
lisaq
ae602ef0c2 login: add support link to disabled password reset page 2016-10-25 21:26:30 +02:00
lisaq
9a0c6ac006 settings: prevent form from updating w/post request fix #3944 2016-10-25 13:35:56 +02:00
lisaq
1712a8028a tests: password reset hidden/disabled options tests fix #3944 2016-10-25 16:40:23 +02:00
lisaq
fcd6a20df6 tests: fixing permissions tests for new password reset options 2016-10-19 16:09:52 +02:00
lisaq
607fd8931d settings: fix #3944 add password reset permission 2016-10-25 17:37:14 +02:00
Marcin Kuzminski
e10c482cd2 docs: updated backup documentation. 2016-10-25 20:00:11 +02:00