jcushman / perma

52%

develop: 83%

LAST BUILD ON BRANCH dev.partners

branch: dev.partners

CHANGE BRANCH

x

Reset

• dev.partners
• 404-500
• PIA-tweak
• admin-fix2
• admin-logout
• admin-registrar
• admin-stats
• admin-stats-fix
• admin-tweaks
• alpha-api
• api-auth
• api-auth2
• api-bugfix
• api-debug-toolbar
• api-error
• api-limits
• api-permissions
• api-queries
• api-search
• api-subdomain
• archive-checks
• archive-path
• archive-sec
• archive-tweaks
• as_json
• assets-test
• auto-close
• auto-cloudflare
• auto-partners
• autoshots
• batch-js-error
• bikeshed
• break-the-loop
• capture-dom
• capture-error-catch
• capture-error-handler
• capture-fix
• capture-fixes
• capture-fixes2
• capture-job
• capture-job-api
• capture-playback-fixes
• capture-progress
• capture-retry
• capture-scroll
• capture-sleep
• capture-time-stats
• capture-tweak-tweaks
• capture-tweaks
• capturejob-failed
• cdx-index
• cdx-max-length
• cdxline-query
• change-pw
• chrome-support
• cleanup
• compare-func
• content-type
• cron
• csrf-logout
• db-settings
• dead-code
• debug-tag
• deleted-orgs-admin
• deploy-maintenance-mode
• dev-IA-and-examples
• dev-PASSWORD_ENDPOINT
• dev-ansible
• dev-create_link_testing
• dev-dark_archive
• dev-default_vesting_org
• dev-folder2
• dev-folder_migrate
• dev-headers
• dev-ohnorobot
• dev-popup_css
• dev-sauce
• dev-search
• dev-shared_folders
• dev.PDF_fix
• dev.capture2
• dev.coveralls
• dev.guid
• dev.heroku
• dev.heroku3
• dev.mirror3
• dev.mirrors
• dev.permabox
• dev.requests
• dev.streamline_capture
• dev.tinc
• dev.travis2
• dev.vagrant
• dev.warc2
• develop
• django-1.10
• django-1.10-2
• django-1.11
• django-1.7-tweak
• django-1.7.10
• django-1.8.11
• django-1.8.13
• django-1.9
• django-1.9.8
• django-admin
• django-extensions
• django-redis-4.4.3
• django1.7
• django1.8
• docs-cleanup
• docs-image-paths
• docs-tweaks
• download-deleted
• dragon-drop
• drf2
• email-footer
• email-template
• error-js
• error-nulls
• export-warcs
• fabfile-updates
• favicon-fix
• favicon-mime
• favicon-status
• favicon-whitelist
• favicons
• file-tests
• firefox-capture2
• fix-admin-test
• fix-cors
• fix-org-limit
• fix-private-links
• fixture-tz
• flaky-crust
• folder-delete
• folder-drag-fix
• folder-fix-part-n
• folder-flag
• folder-scroll
• force-ssl
• form-templates-refactor
• get-check
• git-hook-doc
• git-hooks
• gotta-catch-em-all
• gpg-auth
• group-refactor
• group-updates
• guids
• heroku-db
• heroku-local
• heroku-tweak
• heroku-updates
• hotfix
• ia-sponsor
• ia-upload-hotfix
• ie-iframe-pdf
• ie9
• integration-test-timeout
• integration-tests
• ironcache
• item-lists
• js-fixes
• js-path
• landing-mirror
• lazy-load-folders
• link-counts
• link-edit
• link-edit-fix
• link-edit-fix2
• link-not-found
• link-privacy
• link_id-length
• links-list
• live-counts
• local-datetime-js
• lockss-support3
• logged-out-record-page
• logout-style-tweak
• loose-pdf-validation
• master
• matt-merge
• merge-migrations
• migrate
• mirror-check
• mirror-debug
• mirror-fixes
• mirror-fixes2
• mirror-generic
• mirror-preview
• mirror-ssl
• mirroring
• missing-host
• modal-fix
• move-folder
• new-link-time
• newrelic
• no-noarchive
• no-tools
• node
• old-guid-fix
• on-the-qt
• opbeat
• opbeat-two
• optimize-db-clone
• optimize-links-api
• org-delete
• org-delete2
• org-edit
• org-to-reg
• pagination-error
• partner-pathos
• partners4
• pdf-thumbnail
• pdf-thumbnail2
• pdf-tweak
• pdf-upload
• phillipsm-develop.1402
• pinned-requirements
• pip-sync
• pip-tools
• privacy-cache
• prune-trees
• public-private-partnership
• pytest
• pytest-tweaks
• pywb-0.11
• pywb-0.30.1
• pywb-0.31
• pywb-db-close
• pywb-error-log
• pywb-templates
• pywb-tweak
• queryset
• queue-time
• ratelimit-1.0.0
• reconfigure-for-adhoc-heroku-pipeline-deploys
• redirect-logged-in-user
• redundant-storage
• regenerate-urlkeys
• registrar-deny
• registrar-fields
• remote-functional
• remove-default-org
• remove-default-org2
• remove-mirroring
• remove-read-only-mode
• remove-tastypie
• removing-users
• replacement-link
• report-coverage
• reqs
• run-in-frames
• s3-backup
• safe-delete
• selenium-leak
• service-test
• simpler-queue
• single-link-buttons
• single-link-js
• single-link-resize
• soft-timeouts
• special-date
• special-sauce
• ssl-capture
• ssl-fixes
• ssl-prefixes
• ssl-single-link
• ssl-tweak
• ssl-tweak2
• stage
• stage-stage
• stat-tweaks
• status-check
• switch-link
• sync-cdxline
• tagging
• tastypie-debug
• test-branch
• test-exclude
• test-tweaks
• this-right-here-is-playback-from-wayback
• threadpool
• thumbnail-bg
• thumbnail-fix
• thumbnail-hack
• thumbnails2
• touch-event
• tweaks2
• unicode-capture
• unicode-playback
• unvest
• update-hosts
• update-packages
• upgrade-fabric
• upgrade-pywb
• upload-folder
• upload-record-page
• url-spaces
• user-agent-override
• user-forms-refactor
• user-mgmt-tests
• user-perms
• utc
• v0.56.3
• vagrant-cpus
• variable-link-limit
• vesting-org
• visitor-ip
• warc-cache
• warc-create
• warc-download-check
• warc-storage
• whitenoise
• world-map
• zero-cool

Build # 71

Build Type

push

travis-ci

Committed by jcushman

Commit Message

Fix merge conflict.

Run Details

1295 of 2501 relevant lines covered (51.78%)

0.52 hits per line