Commit graph

21 commits

Author SHA1 Message Date
Marcin Kuzminski
27aff1de7a pull-requests: trigger merge simulation during PR creation. Fixes #5396 2017-10-12 20:57:02 +02:00
Marcin Kuzminski
990994942d pull-requests: use close action with proper --close-commit solution.
- Mercurial settings are no long as LABS
- Unified some code between GIT and HG on rebase/close/delete feature branches
2017-08-24 22:36:34 +02:00
Marcin Kuzminski
ae8340ad2a db: use a wrapper on pull requests _last_merge_status to ensure this is always INT.
- after upgrade of sqlalchemy this is casted to Long
- for backward compat we cast it as Int
2017-07-26 12:16:25 +02:00
Marcin Kuzminski
926a79e98e audit-logs: implemented pull request and comment events. 2017-06-17 15:22:50 +02:00
Marcin Kuzminski
71fee00277 home: moved home and repo group views into pyramid.
- fixed lots of tests related to those changes
- now main and subrepo group views are handled by pyramid.
2017-06-05 15:16:04 +02:00
Marcin Kuzminski
bd1e865c9c pull-request: extended default reviewers functionality.
- added mandatory reviewers JS logic Fixes: #4219
- added option to forbid author to be a reviewer via JS/Frontend checks. Fixes #5190
- added option to forbid adding new reviewers except those defined. Fixes #5208
2017-05-29 20:10:17 +02:00
Marcin Kuzminski
3d3f2db34a core: removed pyro4 from Enterprise code. Fixes #5198 2017-02-07 15:58:49 +01:00
Marcin Kuzminski
23ff2e2325 test: fixes for tests for PR versions. 2017-01-30 12:41:24 +01:00
Marcin Kuzminski
57268f2564 merge-logic: improve merge failed because of conflicts message. 2017-01-19 14:04:19 +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
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
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
Marcin Kuzminski
1d37334326 inline-comments: added helper to properly count inline comments. 2016-12-06 00:18:07 +01:00
Martin Bornhold
00e5b996a5 tests: Use merge reference object instead of raw commit id. 2016-10-24 10:13:29 +02:00
Martin Bornhold
2a64079089 tests: Add missing key/value to vcs operation dummy dict. 2016-09-23 14:17:04 +02:00
Daniel Dourvaris
b3e97c1715 reviewers: store reviewer reasons to database, fixes #4238 2016-09-27 02:34:15 +03:00
Martin Bornhold
62f27a2f43 tests: Add a test that checks return type of pr title generate function. (has to be unicode) 2016-09-26 08:53:31 +02:00
Martin Bornhold
a26deb916c tests: Add missing argument to assert_called_with statements.
Added the `'use_rebase' argument to assert statements which was recently
added to the merge method.
2016-07-08 09:15:03 +02:00
Daniel Dourvaris
9727a3880f events: add event system for RepoEvents 2016-07-06 06:00:18 +03:00
Marcin Kuzminski
9a0d8c0b77 project: added all source files and assets 2016-05-24 15:56:53 +02:00