mysociety / yournextrepresentative

76%

master: 51%

LAST BUILD ON BRANCH backports-including-needs-review

branch: backports-including-needs-review

CHANGE BRANCH

x

Reset

• backports-including-needs-review
• 104-persuasive-homepage
• 123-footer
• 124-candidate-parties
• 130-candidate-editing
• 143-add-parlparse-id-to-2010-mps
• 146-profile-pages
• 171-disclaimers
• 183-login-page-improvements
• 187-og-and-twitter-tags
• 203-disable-submit-on-click
• 246-allow-birth-year-or-dob
• 271-store-twitter-ids
• 319-add-vagrant-file
• 379-add-more-tests
• 383-generic-og-metadata
• 416-update-csv-links
• 53-favicon
• 676-language-switcher
• 692-winner-display
• 749-other-names
• 79-design-improvements
• 855-prefill-party-dropdown-new-list-candidate
• 856-show-elections-won-on-candidate-page
• 862-search-with-apostrophe
• 866-party-list-pos-person-view
• 873-broken-jsonpatch-parsing
• 896-log-photo-reject-reason
• 931-uk-import-2010-winners
• 935-confirm-inset-winners
• 942-optional-election-areatype-admin
• 943-settings-in-db
• 951-candidates-dc-vs-who-in-seo
• TUSC_emblem
• add-attention-needed-page
• add-cache-control
• add-candidacy-historic-elections-option
• add-candidate-pictures
• add-coveralls
• add-descriptions-and-joint-parties
• add-honorifics
• add-leaderboard
• add-new-parlparse-ids
• add-parlparse-to-csv
• add-recent-changes
• add-to-vandalism-list
• add-winner-counts-to-api
• allow-creation-from-manual-area-ids
• allow-twitter-at
• are-we-generic-yet
• before-image-proxy
• cache-popit-results
• calls-to-action
• candidates_ignored_slugs
• changes-for-tls
• changes_feed
• close-signups
• contesting
• copyright-assignment-agreement
• crontab-election-night-updates
• csv-generation-improvements
• d3-user-contributions-graph
• data-cleaning
• dc_logo
• display-more-helpful-constituency-values
• django-1.7
• django-1.7-second-attempt
• django-1.7-travis-no-migrate
• djdt-to-try-on-staging
• elected-button-party-list
• feature/candidates-counts
• feature/candidates-counts-small-change
• feature/csv_export
• feeds_unicode
• fewer-consituencies-queries
• field_drives
• finer-grained-permissions
• fix-add-candidate-button
• fix-cached-counts-update
• fix-fix-data-commands
• fix-image-metadata
• fix-membership-issues
• fix-party-numbers-page-counts
• fix-party-sets-javascript
• fix-settings-validation
• fix-stale-memberships-after-merging
• fix-standalone-create-person-form
• fix-tests
• fix-twitter-case-issue
• fix-update-from-ec-unicode-errors
• flash-photo-review-action-results
• further-genericization
• generic-elections
• group-elections
• homepage-form-margin
• image-queue
• image-queue-upload
• improve-finder-validation
• improve-mirroring
• incomplete_field_lists
• issues/380-electionmixin
• issues/395-argentina-design
• issues/395-homepage-styling
• issues/395-styling-fixes
• javascript-add-candidacy
• ke-2017
• ke-frontpage-tests
• ke-mzalendo-link
• ke-search-label-change
• liable-to-vandalism-in-db
• linkedin-in-csv
• linkify-photo-review-sources
• lock-constituencies
• make-primary-photo-review-option
• mark-incumbents-as-standing
• master
• merge-people
• no-error-emails-on-popit-404
• no-exact-md5sum-test
• noddy-posts-cache
• not-all-constituencies
• notification-of-photos-for-review
• numbers_json
• only-install-django-once
• party-page
• party-page-responsive
• party_id_in_csv
• photo-review-improvements
• photo_upload_help
• popit-down-middleware
• possibly-simplify-numbers
• ppc-importer-updates
• privacy-policy
• progressive-add-candidacy-basic
• refactor-person-handling-squashed
• remove-bad-twitter-data
• remove_ff_banner
• replace-constituency-name-aargh
• reproduce-popit-pagination-error
• restrict-renaming
• result-recorders
• results-feed-updates
• run-on-heroku
• search_links
• small-wording-updates
• staging-with-robots-txt
• stale-popit-workaround
• stronger-source-hints
• suggest-face-crop-in-review
• switch-ga-to-secondary-domain
• switch-to-image-proxy-thumbnails
• switch-to-libsass-and-upgrade-pipeline
• switch-to-photo-upload-radio-buttons
• test-fix
• trans-lang-select
• translatable
• turn-off-edits-stupidly
• twitter_list
• update-about-page
• update-about-page-post-copyright-assignment
• update-db-settings
• update-face-detection-use-of-pillow
• update-parties
• update-party-update
• wip-add-descriptions

Build # 3078

Build Type

push

travis-ci

Committed by mhl

Commit Message

Merge two independent branches of migrations

The DemocracyClub and mySociety forks of YNR now have a different
migration history in the candidates app. At this point we have
backported some of the code + migrations from the DemocracyClub fork,
but not all. This means that the code that appplies migrations when
creating a dependency graph can't tell which is the most recent - this
commit adds a dependency from one of the mySociety fork's migrations
to one of those from the DemocracyClub fork, so that Django migrations
can order these migrations.

Up to this point, the migrations in the two forks are genuinely
independent, I believe, so there should be no problem with conflicts.
There are further migrations to come, so at some point we'll have to
make a similar commit to merge the later migration history as well.

Run Details

9241 of 12190 relevant lines covered (75.81%)

2.27 hits per line