Commit graph

71 commits

Author SHA1 Message Date
Marcin Kuzminski
47f72d2b19 search: moved search into pyramid views. 2017-04-21 17:10:26 +02:00
Marcin Kuzminski
ecea35f018 comments: allow parsing the issue tracker patterns inside the markup
language for comments.

- need to pass in repo name to renderer helper to activate it.
2017-04-20 16:26:15 +02:00
Marcin Kuzminski
858dfef419 git-lfs: settings for GIT repos to enable git-lfs and set store location
- ref #4235
2017-03-21 17:23:28 +01:00
Marcin Kuzminski
ca9e08007f git-lfs: added tests for git-lfs protocol detection
- refs #4235
2017-03-17 15:48:07 +01:00
Marcin Kuzminski
9df656a516 markup-rendering: added relative image support.
- adds translation of relative to absolute urls
- fixes #5235
2017-03-10 00:16:09 +01:00
Marcin Kuzminski
d6dfdba2a8 auth-tokens: fixed tests 2017-02-28 12:49:40 +01:00
Marcin Kuzminski
ab24af89d2 auth-tokens: disable authenticating by builtin token. 2017-02-27 11:45:30 +01:00
Marcin Kuzminski
1f65204749 hooks: added new pretx hook to allow mercurial checks such as protected branches, or force push. 2017-02-23 16:53:11 +01:00
Marcin Kuzminski
de46f438ae tests: fixed tests for the added extra traceback with exceptions for vcsserver. 2017-02-23 13:56:11 +01:00
Marcin Kuzminski
5c2c266ee9 auth-tokens: updated logic of authentication to a common shared user method. 2017-02-13 14:36:48 +01:00
Marcin Kuzminski
3d3f2db34a core: removed pyro4 from Enterprise code. Fixes #5198 2017-02-07 15:58:49 +01:00
Marcin Kuzminski
9554c059c0 tests: fixed tests for graphmod 2017-01-31 21:13:03 +01:00
Marcin Kuzminski
4289b53c04 renderer: don't render plaintext files as RST 2017-01-10 10:38:48 +01:00
Marcin Kuzminski
fcc027c282 license: updated copyright year to 2017 2017-01-02 09:30:39 +01:00
Marcin Kuzminski
e44090dfe8 diffs: compare overhaul.
- made compare and commit range pages more consistent with other commit diff pages
- removed mergerly, closes #4665. Old diff2way is replaced by new diffs with
  side-by-side mode.
- cleanup button behaviour on compare page. Added help text and
  generally improved UX
- switched file-diffs to compare page with file filter. Part of #4000
- added collapse/expand commits buttons in compare views.
2016-12-22 23:48:05 +01:00
Marcin Kuzminski
4a415909c6 tests: use custom test app for better debug of .mustcontain function.
- now output of html of .mustcontain we save as physical files.
2016-12-21 19:32:41 +01:00
Marcin Kuzminski
9d8634a618 pull-requests: expose version browsing of pull requests.
- show nav for browsing each version of pr
- show detailed changes for each of version
- update comment template to indicate the changes were due to update of a pr
2016-12-19 17:38:22 +01:00
Marcin Kuzminski
0b5d562197 dependencies: bumped pytest libraries to latest versions. 2016-12-06 23:47:47 +01:00
Marcin Kuzminski
c68c339c0b system-info: fetch vcs settings from vcsserver. Fixes #4276
- redone the system info page. Errors/Warnings now show next to the
data, and also show up in API call.
- implemented fetching of git/hg/svn version from running vcsserver
- implemented fetching of vcsserver version from itself
- added more warnings/errors detection on RAM/Inodes etc
- few cleanups
2016-11-14 21:14:29 +01: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
af4ba1eff5 codeblocks: add new code token rendering function that
supports diff and normal tokens.
2016-10-19 10:37:07 +03:00
Martin Bornhold
a9a4e32eed subprocess: Change all imports from subprocess -> subprocess32 2016-10-14 09:37:44 +02:00
Martin Bornhold
88a384f13c tests: Fix error introduced by rebasing. 2016-10-11 13:27:51 +02:00
Martin Bornhold
2b09ada931 tests: Make test work with either http or pyro4 protocol. 2016-10-10 14:32:46 +02:00
Martin Bornhold
efcfc61e67 tests: Fix test that expects the pyro4 scm app as default. 2016-10-07 10:32:28 +02:00
Martin Bornhold
8279f376a9 tests: Fix tests that depend on the default value of 'pyro4' as backend. 2016-10-04 14:37:09 +02:00
Martin Bornhold
ecc24326d7 vcs: Do not pass the backend key into the scm app instances.
We used the key as a value for a response header. Since this header is removed there
is no need to pass the backend key araound.
2016-10-06 16:25:27 +02:00
Martin Bornhold
c6466346b4 vcs: Remove custom response header which contains backend key.
We used this custom header to skip the error handling.
This is no linger needed since the VCS middleware is moved above of the error handling.
2016-10-06 16:10:40 +02:00
Martin Bornhold
861adffd82 tests: Add a way to deactivate exception re-raising in tests. 2016-10-07 09:15:43 +02:00
Martin Bornhold
cc4ab6dae7 tests: Use only one place to define pr and shadow URL segments. 2016-09-28 13:40:01 +02:00
Martin Bornhold
974c9b8766 tests: Add tests to check the shadow-repo regular expression. 2016-09-28 13:26:30 +02:00
Martin Bornhold
ad14211248 tests: Adapt test to recent changes.
This argument was removed.
2016-09-27 09:48:59 +02:00
Martin Bornhold
0a34a8c1df tests: Fix tests which need the DB to run. 2016-09-27 09:48:42 +02:00
Martin Bornhold
ae2b380d5b tests: Add tests to check the shadow repo exposure of the simplevcs class. 2016-09-26 14:55:30 +02:00
Martin Bornhold
16bac867f5 tests: Make return values of stub vcs controller editable. 2016-09-26 14:54:58 +02:00
Martin Bornhold
69f6006e28 tests: Add some tests to check that events/extensions are triggered on hook execution.
This also includes tests to check that events/extensions are NOT triggered
on requests to shadow repositories.
2016-09-23 16:23:08 +02:00
Martin Bornhold
3c6a97202a tests: Add new attribute is_shadow_repo to test dummy extra data. 2016-09-23 14:31:36 +02:00
Johannes Bornhold
08a2b45999 vcs: Minimal change to expose the shadow repository
Based on my original research, this was the "minimal" starting point. It shows
that three concepts are needed for the "repo_name":

* From the security standpoint we think of the shadow repository having the same
  ACL as the target repository of the pull request. This is because the pull
  request itself is considered to be a part of the target repository.

  Out of this thought, the variable "acl_repo_name" is used whenever we want to
  check permissions or when we need the database configuration of the
  repository. An alternative name would have been "db_repo_name", but the usage
  for ACL checking is the most important one.

* From the web interaction perspective, we need the URL which was originally
  used to get to the repository. This is because based on this base URL commands
  can be identified. Especially for Git this is important, so that the commands
  are correctly recognized.

  Since the URL is in the focus, this is called "url_repo_name".

* Finally we have to deal with the repository on the file system. This is what
  the VCS layer deal with normally, so this name is called "vcs_repo_name".


The original repository interaction is a special case where all three names are
the same.

When interacting with a pull request, these three names are typically all
different.

This change is minimal in a sense that it just makes the interaction with a
shadow repository barely work, without checking any special constraints yet.
This was the starting point for further work on this topic.
2016-09-18 20:01:19 +02:00
lisaq
db3f788080 ux: better tooltip for inline comment toggle 2016-09-29 12:32:25 +02:00
Daniel Dourvaris
f10e21cde9 jsonalchemy: add tests for using the json types in an sqlalchemy
context and make sure that the values returned are correctly
returned and stored in the database
2016-09-28 06:37:50 +03:00
Martin Bornhold
cf6af66533 tests: Adapt tests to recent changes in vcs lib. 2016-09-26 15:43:55 +02:00
Martin Bornhold
8e531005da pyro4: Add the custom header X-RhodeCode-Backend to the pyro4 backend responses.
This custom header sets the SCM backend which is in use. It is used to identify
VCS responses in the error handler. VCS responses are skipped during error handling.
2016-09-26 14:52:06 +02:00
Johannes Bornhold
55b3018fc2 renderer: Clean up obsolete code
Removing now unused code from markup_renderer.
2016-09-08 11:13:33 +02:00
Marcin Kuzminski
df353f19ea vcs: register repo_name as specialized middleware variables instead
of relying on env variables.

- use order of defined vcs.backends to detect middleware for handling requests
2016-09-06 19:49:28 +02:00
Marcin Kuzminski
d92e030879 vcs: moved svn proxy settings into vcs related settings
- vcs middleware now returns dummyHandler if not configured
- propagate the per-repo vcs related configs into VCSMiddleware
- moved the forms arround and group things into more logical blocks
2016-09-06 12:29:54 +02:00
Daniel Dourvaris
f9e2cd26fe tests: disable pretty error page handler for tests, with option to
disable when testing error pages, fixes #4208
2016-09-02 09:24:57 +03:00
lisaq
666df1ef47 tests: adjusting tests for inline comment toggle 2016-08-23 13:33:08 +02:00
Daniel Dourvaris
5a3574412b vcs-error: replace disable_vcs middleware with vcs and http exceptions
to avoid vcs connection errors showing to the end user fixes #4140
2016-08-17 07:12:38 +03:00
Martin Bornhold
6fce04f6d1 tests: Adapt tests to recent changes. 2016-08-09 16:34:03 +02:00
Martin Bornhold
d7ee3ddb9b tests: Add custom header to expected headers 2016-08-09 16:33:38 +02:00