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
Martin Bornhold
d7bec50fc7
tests: Fix test that modifies test repo settings.
...
This test now creates it's own repo to modify the repo vcs settings.
Instead of modifying the settings of the vcs_test_repo which is used
in other tests again.
2016-07-08 08:34:12 +02:00
Marcin Kuzminski
51e1968537
readme/markup: improved order of generating readme files. Fixes #4050
...
- we now use order based on default system renderer
- having multiple readme files will pick correct one as set renderer
2016-07-07 00:50:39 +02:00
Marcin Lulek
f8716e4525
templateContext: improve the context object idea
2016-07-07 15:33:43 +02:00
Marcin Lulek
50f344ce72
templateContext: allow for flexible way to communicate additional info for client code from controllers
2016-07-07 14:15:03 +02:00
Daniel Dourvaris
279ff90ec3
events: remove accidental line
2016-07-07 11:32:43 +03:00
Daniel Dourvaris
c1b109c7a0
events: fix bug, 'url' was not in dict
2016-07-07 05:35:54 +03:00
Daniel Dourvaris
04044ef919
events: add comment on SYSTEM_USER
2016-07-07 04:34:43 +03:00
Daniel Dourvaris
d450931752
events: remove attribute from schema, redundant
2016-07-07 04:32:43 +03:00
Daniel Dourvaris
597b9b24d7
events: fix bugs with serialization of repo/pr events and add tests for those cases
2016-07-07 04:31:17 +03:00
Marcin Kuzminski
6aafd24fce
docs: fixed a svn checkout typo. Fixes #4067
2016-07-07 10:13:38 +02:00
Martin Bornhold
206c465640
api: Add api methods to get/set repository settings, implements #4021
2016-07-06 16:33:56 +02:00
Marcin Lulek
26749b8ca5
diffs: bring back blue line highlight on comment link
2016-07-06 16:25:15 +02:00
Marcin Lulek
29c54ee77a
tooltips: remove all occurences of explicit tooltip activation
2016-07-06 15:51:06 +02:00
Marcin Lulek
bcb73b4b91
diffs: add translation string
2016-07-06 15:43:25 +02:00
Marcin Lulek
5d275341b8
events handling: minimize the amount of events attached per page
2016-07-06 15:23:11 +02:00
Marcin Lulek
8845413038
tooltips: use a single delegated event for tooltips
2016-07-06 15:21:58 +02:00
Marcin Kuzminski
d37b54ff54
makefile: disable linting tests, they should be executed manually if required
2016-07-06 15:45:11 +02:00
Daniel Dourvaris
326f04ad63
events: remove accidental raise
2016-07-06 12:31:51 +03:00
Daniel Dourvaris
23d7a947f5
events: add serialization .to_dict() to events based on marshmallow
2016-07-06 12:21:03 +03:00
Daniel Dourvaris
a0af559a3d
events: add pull request events
2016-07-06 07:15:02 +03:00
Daniel Dourvaris
9f25d52d44
events: rename event_type to events_types as it's multiple
2016-07-06 07:14:48 +03:00
Daniel Dourvaris
b6bf036756
events: use context manager for testing fired events
2016-07-06 06:38:14 +03:00
Daniel Dourvaris
9727a3880f
events: add event system for RepoEvents
2016-07-06 06:00:18 +03:00
Marcin Lulek
9875dca82f
autoscroll: always scroll into view before dispatching topic
2016-07-06 10:40:46 +02:00
Marcin Lulek
c4d5806b35
frontend: prepare for plugin registration and life-cycle handling
2016-07-05 17:01:04 +02:00
Marcin Lulek
aab9035ccd
frontend: remove unused chat code and convert it to topics
2016-07-04 17:41:42 +02:00
Martin Bornhold
834f1a2fdb
tests: Fix tests for moved labs setting.
...
The labs setting for hg rebase merge strategy was moved from global labs
settings to the vcs settings.
2016-07-06 11:05:13 +02:00
Martin Bornhold
8898e68d64
tests: Test the hg rebase setting on repo vcs setings page.
2016-07-06 10:41:15 +02:00
Martin Bornhold
b4ff4dfd33
tests: Add test to check that the rebase-merge setting is available on hg repos.
2016-07-05 16:49:19 +02:00
Marcin Kuzminski
a1f0bf42dd
docs: use custom footer with links to docs issues. Fixes #4066
2016-07-05 23:19:56 +02:00
Marcin Kuzminski
f4eab2cc4a
docs: updated dependencies for docs build
2016-07-05 22:28:51 +02:00
Marcin Kuzminski
fe4c5863f0
labs: enable by default. We want people to encourage using those
2016-07-05 21:18:30 +02:00
Martin Bornhold
8ad6c162c7
settings: Use the old layout to display labs settings.
2016-06-28 17:30:31 +02:00
Martin Bornhold
77c3287d4a
settings: Delete obsolete code related to the rebase-merge lab settings.
2016-06-27 16:53:36 +02:00
Martin Bornhold
0f767f23a4
settings: Remove obsolete VCS config value HG_USE_REBASE_FOR_MERGING
2016-06-27 13:30:27 +02:00
Martin Bornhold
1824a54c6d
settings: Use the new 'use_rebase' argument to decide between rebase or merge.
2016-06-27 13:18:25 +02:00
Martin Bornhold
b545575d28
settings: Read 'rebase-merge' config option and pass it to the VCS insntacen on merge.
2016-06-27 13:17:41 +02:00
Martin Bornhold
488bd2df2f
settings: Add argument to select rebase as merge strategy.
2016-06-27 13:16:10 +02:00
Martin Bornhold
d80ead44a9
settings: Display 'rebase-merge' option in VCS settings.
2016-06-27 11:00:57 +02:00
Martin Bornhold
b3a1dec11e
settings: Add the 'rebase-merge' setting to VCS base form and VCS settings model.
2016-06-27 11:00:22 +02:00
Martin Bornhold
b0612b7dc6
settings: Add 'labs_active' flag to template context.
2016-06-27 10:58:53 +02:00
Marcin Kuzminski
e5f91c3075
deps: bumped supervisor to 3.3.0 and psycopg2 to 2.6.1
2016-07-05 13:06:43 +02:00
Martin Bornhold
dec51f1669
pyro: Slightly improved log message and comment.
2016-07-05 09:37:57 +02:00
Martin Bornhold
64893dfad5
pyro: Return new proxy instances if called from outside of a request context.
...
This allows to run code that uses the pyro connection to the VCSServer
but does not execute from within a request context, e.g. invoke tasks.
2016-07-05 09:37:13 +02:00
Marcin Kuzminski
d29f7ba684
notify-script: allow to comment also on single commit
2016-07-05 09:59:10 +02:00
Marcin Kuzminski
60b6490ced
api: make comment_commits api have consistent permissions with web interface.
2016-07-05 09:56:44 +02:00
Marcin Kuzminski
9763f430b4
tests: fixed test after update of cs cache changes.
2016-07-04 23:55:36 +02:00
Marcin Kuzminski
7a74dfce1a
packaging: updated pygments to 2.1.3, fixes #4034
2016-07-04 23:32:34 +02:00
Marcin Kuzminski
79bb294282
system: send platform and version to upgrade endpoint.
2016-07-04 23:23:55 +02:00
