uw-it-aca / mdot

99%

master: 94%

LAST BUILD ON BRANCH feature/bootstrap-custom

branch: feature/bootstrap-custom

CHANGE BRANCH

x

Reset

• feature/bootstrap-custom
• feature/travisci
• develop
• feature/launcher-design
• feature/visual-branding
• navigation
• merge_navigation
• master
• feature/client
• narrative
• header-styles
• font1
• font2
• font3
• font4
• improvement/template
• revert-17-improvement/template
• improvement/template-values
• feature/uw-branding
• feature/livedao
• imprv/refactor
• bug/resource-link-display
• improvement/resource-image
• app_styles
• feature/mock_data
• improvement/more-unit-tests
• feature/travis
• feature/filtering
• feature/multiattrs
• improvement/recess-ci
• improvement/native-link-method
• font
• brand
• improvement/test-refactor
• feature/dev-callout
• improvement/sort-resources
• feature/native-marker
• brand1
• brand2
• brand3
• brand4
• brand5
• brand-fluid
• style
• brand6
• brand_purple
• prerelease
• badges
• uw_fonts
• a11y
• desktop
• content
• native_icon
• native_list
• revert-67-prerelease
• analytics
• names
• tagline
• icons
• remove_unused
• styles
• links
• feature/loadcss
• feature/htmlmin
• feature/jinja2
• googleux
• feature/compressor-overrides
• impr/http_stripping
• feat/login
• v1.0
• impr/unitTest_link_fix
• hotfix/breach
• hybridize
• feature/boilerpate-update
• feature/docker-container
• old-develop
• bug/MDOT-28
• bug/MDOT-29
• qa
• feature/envvars
• feature/docker-improve
• feature/turbolinks-support
• feature/hybrid-updates
• feature/django-user-agents
• feature/django-upgrade
• hotfix/google_compute_engine
• feature/dev-resources
• feature/contact_us
• task/MDOT-46
• task/MDOT-53
• task/update_ex_settings
• task/MDOT-47
• task/MDOT-48
• task/MDOT-56
• task/MDOT-55
• task/MDOT-40
• task/MDOT-59
• task/MDOT-54
• task/update_readme
• task/mdot-54
• task/MDOT-61
• hotfix/django-version
• task/test-travis
• task/mci-test-travis
• bug/MDOT-72
• feature/mci-dev
• mysql-libs
• task/MDOT-73
• task/MDOT-60
• feature/mci-prod
• task/MDOT-74
• task/feature-feedback
• feature/mci-merge
• task/MDOT-65
• task/updates
• mci/improvements
• mci/prod-fix
• mci/live-api
• mci/buffer-size
• mci/ingress-annotations
• main

Build # 310

Build Type

push

travis-ci

Committed by charlon

Commit Message

Fixes merge conflicts and failing travis build.

Run Details

268 of 271 relevant lines covered (98.89%)

0.99 hits per line