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

1346 commits

This branch
This branch
All branches
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
a044290ee2 comments: show links to unresolved todos 
- show hidden comments when using navigation for comments
- small UI fixes
 2017-01-19 13:59:02 +01:00
Marcin Kuzminski
7b5e288d8c outdated-notes: show navigation on outdated comments 2017-01-19 13:58:15 +01:00
Marcin Kuzminski
e63934c25b todos: all todos needs to be resolved for merge to happen. 
This will prevent the outdated todos beeing automatically marked as solved becuase of bigger diff
changes. It's better to mark commits quickly as resolved instead of potentially have unresolved todos hidden
because of invlidation logic.
 2017-01-19 13:57:46 +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
246f2093bd celery: handle pyramid/pylons context better when running async tasks. 2017-01-18 23:13:27 +01:00
Marcin Kuzminski
b753a099d7 svn-conf: hide password entries in logs for generated configuration. 2017-01-16 18:13:24 +01:00
Marcin Kuzminski
3f9289f77f api: added comment_resolved_id into aprameters to resolve TODO notes via API. 2017-01-18 19:15:46 +01:00
Marcin Kuzminski
cc9db5e79e api: added possibility to specify comment_type for comment API. 2017-01-18 19:07:49 +01:00
Marcin Kuzminski
7ff55b266b tests: fixed api merge tests after introducing merge checks. 2017-01-18 14:29:21 +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
e5f1efc7f7 pull-request: introduced new merge-checks. 
- merge checks show nicer UI for status of merge approval inside PR
- merge checks now also forbid a merge if TODO notes are present
- use global refresh merge check when submitting comments. It
  no longer required page reload when submitting status change.
 2017-01-16 22:58:44 +01:00
Marcin Kuzminski
986141fb9f tests: fixed tests for changed repr. 2017-01-16 18:59:36 +01:00
Marcin Kuzminski
e8447b4107 comments: use unified aggregation of comments counters. 
- use 1 source of count and display objects
- scroll to for hidden comments will show them before scroll
- properly show how many comments we're displaying for each version
 2017-01-16 18:12:38 +01:00
Marcin Kuzminski
a24ca60752 comments: fixed compare view comments. 2017-01-11 14:03:18 +01:00
Marcin Kuzminski
caee47148f comments: skip already deleted comments and make sure we don't raise unnecessary errors. 2017-01-11 14:02:34 +01:00
Marcin Kuzminski
62e22ad5de js: cleanup linkifyComments function 2017-01-11 14:13:55 +01:00
Marcin Kuzminski
c4b49c5757 js: cleanup unused javascript code. 2017-01-10 23:48:20 +01:00
Marcin Kuzminski
e18c9b0cec comments: do a better reset state. 2017-01-10 23:38:08 +01:00
Marcin Kuzminski
6ccb2377c3 comments: enabled resolution for general comments, and finalized how general comment is build 2017-01-10 23:51:49 +01:00
Marcin Kuzminski
8f1db17117 comments: allow submitting id of comment which submitted comment resolved. 
- use common template for inject forms
- cleanup of JS models, bind class of Form into the form itself
 2017-01-11 15:05:33 +01:00
Marcin Kuzminski
24ef7171f8 comments: add comments type into comments. 2017-01-11 14:46:29 +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
828c060bdd comments: changed signature of create method of ChangesetComment. 
- use commit_id instead of revision
- add placeholder for comment_type
 2017-01-09 17:46:53 +01:00
Marcin Kuzminski
5bab4b8a0c login: removed log_session model, and replaced it with two lines of code. 
- also remove usage of template context
- having dedicated model for this operation wasn't really required.
 2017-01-13 14:04:44 +01:00
Marcin Kuzminski
266f9e7ec4 integrations: remove usage of template context from integrations models 2017-01-13 13:59:02 +01:00
Marcin Kuzminski
c7d0aff98a notifications: don't rely on template context variable in notification model. 2017-01-13 13:51:54 +01:00
Marcin Kuzminski
9b1888af88 base: show my account as active when we're showing this view. 
Wrong an admin was selected before.
 2017-01-13 13:14:58 +01:00
Marcin Kuzminski
d053979d83 utils: switched age function to use lazy translated pyramid translation mechanism. 2017-01-13 12:25:44 +01:00
Marcin Kuzminski
a01df6d465 site: added dummy robots.txt to handle those from crawling robots. 2017-01-13 11:32:41 +01:00
Marcin Kuzminski
30fe983ff5 logging: added additional log info to vcs detection util. 2017-01-13 11:28:17 +01:00
Marcin Kuzminski
85a3a40913 error-handling: show tracebacks only for error code 500 and above. 2017-01-13 11:27:38 +01:00
Marcin Kuzminski
e9a7b71fcc settings: fixed found problem on new admin pyramid views, and made all test pass for them. 2017-01-12 23:48:27 +01:00
Marcin Kuzminski
17e7992166 tests: improve debugging of failed flash messages. 2017-01-12 23:46:43 +01:00
Marcin Kuzminski
4c2c087cf8 core: let pyramid handle tracebacks for all exceptions. 
Otherwise we'll miss exception caused in pure pyramid view.
 2017-01-12 23:36:07 +01:00
Marcin Kuzminski
4e8c6733a7 auth: use pyramid HTTP excetion when detecting CSRF error. It helps catching this 
error by our error handler and displaying it nicely to users.
 2017-01-12 23:17:19 +01:00
Marcin Kuzminski
d969440caa core: use proper event to bootstrap pylons env. 
- allows to skip this for VCS and API calls in more efficient way.
- fixes #5164
 2017-01-12 21:47:02 +01:00
Marcin Kuzminski
e02a88e64d system-info: fix unicode problem on translation 2017-01-12 18:26:34 +01:00
Marcin Kuzminski
526cdfd9b2 i18n: use consistent way of setting user language. 2017-01-12 17:05:06 +01:00
Marcin Kuzminski
4be3097bae settings: switched system-info to pyramid view. 2017-01-12 16:24:43 +01:00
Marcin Kuzminski
c9799e82e6 i18n: translate properly navList and also support proper translation into other admin views. 2017-01-12 16:06:06 +01:00
Marcin Kuzminski
a96cc165ee i18n: added pluralize to renderer globals. 2017-01-12 15:39:37 +01:00
Marcin Kuzminski
32df9f662a i18n: enable translation defaults for pyramid views. 2017-01-12 15:31:58 +01:00
Marcin Kuzminski
f5d51eca24 admin: re-organized new pyramid admin views into corresponding modules. 2017-01-12 14:20:40 +01:00
Marcin Kuzminski
ff1a45e847 session: moved session cleanup to pyramid views. 2017-01-12 14:10:20 +01:00
Marcin Kuzminski
64b98245ef code: added more logging, and some notes 2017-01-12 12:54:21 +01:00
Marcin Kuzminski
6d2a154667 auth: improve logging for auth methods. 2017-01-12 12:07:11 +01:00
Marcin Kuzminski
0b609b34b8 user-sessions: fix other backend expired count, and fixed some helper text. 2017-01-12 01:45:46 +01:00
Marcin Kuzminski
584bd214ae vcs: do an early detection of vcs-type request. 
We we to know to detect vcs type request as early as possible. IF we know
we're handling an VCS request, we can skip some of the pylons stack initialization.

- This fixes issues with leaking sessions and other object from pylons into
a purely VCS type request.
 2017-01-12 01:20:31 +01:00
Marcin Kuzminski
2b30c7c2b7 logging: improve slightly password reset logs. 2017-01-11 19:55:56 +01:00