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

1056 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Daniel Dourvaris
f7d846560f ux: make 'no newline at end of file' message more pronounced in diffs 2016-10-25 17:24:56 +03:00
Daniel Dourvaris
8fec78d0a9 ux: make show file after/before links unclickable and black if 
they are disabled
 2016-10-25 17:24:29 +03:00
Daniel Dourvaris
12ebe4382a diffs: replace compare controller with new html based diffs: 
* side/side + unified support
* redesign of diff changes/operations
* added button to see file before the change
* auto collapses large diffs

refs #4232
 2016-10-19 14:29:51 +03:00
Daniel Dourvaris
067756822f files: don't load the file if it is over the size limit since it 
won't be displayed anyway - increases speed of loading the page
when a file is too big
 2016-10-21 07:38:10 +03:00
Daniel Dourvaris
1960780e96 nix: add pygments-markdown-lexer for highglighting markdown files 2016-10-20 02:46:43 +03:00
Marcin Kuzminski
c069290119 system-info: expose inode limits and usage. Fixes #4282 2016-10-18 14:49:45 +02:00
Marcin Kuzminski
56c8deb944 packaging: bumped psutil to latest version 2016-10-18 14:05:17 +02:00
Daniel Dourvaris
af4ba1eff5 codeblocks: add new code token rendering function that 
supports diff and normal tokens.
 2016-10-19 10:37:07 +03:00
Martin Bornhold
984d8c3212 svn-support: Only add reload-cmd subscriber if a reload command is set. 
If no reload command is set in the ini file there is no need
to add the subscriber to the event.
 2016-10-17 16:44:26 +02:00
Martin Bornhold
de243f8c31 svn-support: Add missing argument to tmplate context. 
This argument was only added in the view handling GET requests.
But in case of an error the POST view also rederes the template
and threfore need this arguement.
 2016-10-17 16:43:13 +02:00
Martin Bornhold
ee90352440 svn-support: Only show 'generate config' button if config generation is enabled. 2016-10-17 13:46:51 +02:00
Martin Bornhold
f18488ecab svn-support: Fix tests for subversion support. 
Pass authentication realm to render function instead of retrieving it inside.
 2016-10-17 12:09:50 +02:00
Martin Bornhold
c663f2f646 events: Add comments to the subcriber classes. 2016-10-17 10:45:13 +02:00
Martin Bornhold
ec8d1af12f events: Move subscriber classes from svn_support to rhodecode.subscribers. 
These classes are generic and can be used by other components as well.
Thereofore they should not live inside of the svn_support package.
 2016-10-17 10:44:56 +02:00
Martin Bornhold
472f756d3d svn-support: Remove commented code. 2016-10-17 10:25:49 +02:00
Martin Bornhold
a6c17ea43b svn-support: Use a queue and worker thread to serialize execution of event subscriber. 2016-10-17 08:42:51 +02:00
Martin Bornhold
b81e0eb4d5 svn-support: Use shlex to split the reload command for subprocess usage. 2016-10-14 15:41:22 +02:00
Martin Bornhold
2a2581e7b3 svn-support: Make the reload command timeout configurable via ini file. 
Duration of the reload command may heavily vary between different
commands, setups, etc. Therefore we should make the timeout
configurable. This way customers can adapt it to their needs.
 2016-10-14 15:40:48 +02:00
Martin Bornhold
30f00dc9fd svn-support: Add js on click handler to trigger Apache config genreation. 
Th on click handler sends a POST to trigger the config file generation.
On succes it displays a notification to the user.
 2016-10-14 15:11:04 +02:00
Martin Bornhold
6734ebac75 svn-support: Add a button to vcs-svn settings template to generate Apache config. 2016-10-14 15:09:43 +02:00
Martin Bornhold
03c17a2a57 svn-support: Add a view to trigger the (re)generation of Apache mod_dav_svn configuration file. 
The configuration is automatically generated if a repository group is changed.
This is problematic in a case where no repository groups are used (yet).
Therfore an option is needed to start the geneartion manually.
 2016-10-14 14:56:34 +02:00
Martin Bornhold
9b4da4cb9b svn-support: Add subscriber to execute the svn.proxy.reload_cmd on config changes. #4271 2016-10-14 11:56:12 +02:00
Martin Bornhold
41c9d26f81 svn-support: Add event to singnal apache mod dav svn configuration changes. 2016-10-14 11:57:21 +02:00
Martin Bornhold
f18ea2abf4 svn-support: Add reload command option (svn.proxy.reload_cmd) to ini files. 2016-10-14 10:04:17 +02:00
Martin Bornhold
a17adc9084 packaging: Fix versions of Chameleon(==2.24) and urllib3(==1.16). 2016-10-14 09:42:40 +02:00
Martin Bornhold
a9a4e32eed subprocess: Change all imports from subprocess -> subprocess32 2016-10-14 09:37:44 +02:00
Martin Bornhold
f5a84e0461 nix: Add subprocess32 to build inputs. 
From the python 2 docs: POSIX users (Linux, BSD, etc.)
are strongly encouraged to install and use the much
more recent subprocess32 module instead of the version
included with python 2.7. It is a drop in replacement
with better behavior in many situations.
 2016-10-14 09:23:41 +02:00