yakky / django-cms

82%

develop: 71%

LAST BUILD ON BRANCH remerge_3014

branch: remerge_3014

CHANGE BRANCH

x

Reset

• remerge_3014
• _merged/3.0/feature/admin_edit_title
• _merged/3.0/feature/api_docs_fixes
• _merged/3.0/feature/django_16_reb
• _merged/3.0/feature/fix_2250
• _merged/3.0/feature/stacks_changelog
• _merged/3.0/selenium-travis
• _merged/3.1/feature/drop_1.5
• _merged/feature/no_selenium_on_travis
• _tmp/feature/django_16_reb
• blueprint_unbundled_30
• demo/toolbar_changelist
• feature/308
• feature/check_middlewares
• feature/cleanup_migrations
• feature/django_18
• feature/django_1_112
• feature/docs_installation
• feature/fix_appconfig_select
• feature/show_edit_model_icon
• future/appspaced_apphooks
• master+
• merge/3.0.x
• merge/3604
• release/3.0.6
• release/3.1.2
• reversion
• tmp/misc_test_branch
• try

Build # 1354

Build Type

push

travis-ci

Committed by yakky

Commit Message

Merge remote-tracking branch 'upstream/support/3.0.x' into c

Conflicts:
	CHANGELOG.txt
	cms/admin/change_list.py
	cms/cms_toolbar.py
	cms/menu.py
	cms/templatetags/cms_tags.py
	cms/test_utils/project/sampleapp/menu.py
	cms/test_utils/project/sampleapp/urls.py
	cms/test_utils/project/sampleapp/views.py
	cms/tests/apphooks.py
	cms/tests/menu.py
	cms/tests/multilingual.py
	cms/tests/placeholder.py
	cms/tests/toolbar.py
	cms/utils/plugins.py
	menus/menu_pool.py
	menus/templatetags/menu_tags.py
	setup.py
	test_requirements/django-1.4.txt
	test_requirements/django-1.5.txt
	test_requirements/requirements_base.txt

Run Details

1409 of 1713 relevant lines covered (82.25%)

0.82 hits per line