hasgeek / funnel

54%

master: 58%

LAST BUILD ON BRANCH fix-team-merge

branch: fix-team-merge

CHANGE BRANCH

x

Reset

• fix-team-merge
• 403
• Change-to-`menu`-from`item-collection`-in-boxoffice-widget
• absent-recaptcha
• accessibility
• account
• account-contacts
• account-description-fix
• account-details-mobile-fix
• account-fixes
• account-menu-membership
• account-new
• actions-backend-tests
• add-banner
• add-cascade
• add-logo-url-form
• add-posh-policy
• add-widget
• add_cors
• admin-btn
• agenda-view
• ajax-login-submit
• ajax-projects
• allow-account-name-unset
• anchors
• annotations
• appframe
• argon2
• audit-relationships
• autosave
• aws
• aws-ses
• backrefs
• badge-default-style
• badge-single-sided
• badge-style
• banner
• banner-sizes
• black
• black-formatting
• black-update
• blake2b
• blog-model
• bookmark
• boxoffice-user-details
• btn-eyebrow-txt
• calendar-mobile-styling-fixes
• calendar-ui
• card-bookmark
• check-env
• checkin
• checkin-fix
• classview-reorg
• classview-section
• cleanwebpack
• comment-ajax
• comment-email-fix
• comment-fix
• comment-in-reply-to
• comment-membership
• comment-notification-category
• comment-perms
• comment-posted-by
• comment-report-fix
• comment-report-notif
• comment-ui
• comment-verified-state
• comments-new-ui
• comments-no-json-fix
• comments-recaptcha
• commentset-cascade
• commentset-membership
• conditional-state-sql
• config-env
• connected-apps
• contact-exchange
• cookie-session-fix2
• copying-proposal
• crew-bio
• crlf-tab
• csrf-move-fix
• css-fix
• css-fix-minor
• current-sessions
• current_schedule
• custom-short-url
• cypress
• dailystats-update
• date-widget
• datefield
• datelocation-deprecate
• datelocation-split
• db-schema-sync
• dbconfig
• decorator-typing
• deepsource-and-template-fixes
• delete-account
• delete-events
• delete-ticket-client
• deleted-comment-redirect-fix
• deleted-user-profile-url
• dependabot/npm_and_yarn/babel/runtime-7.27.3
• dependabot/npm_and_yarn/braces-3.0.3
• dependabot/npm_and_yarn/cross-spawn-7.0.6
• dependabot/npm_and_yarn/cypress/request-and-cypress-3.0.0
• dependabot/npm_and_yarn/form-data-4.0.4
• dependabot/npm_and_yarn/funnel/assets/ini-1.3.7
• dependabot/npm_and_yarn/funnel/assets/lodash-4.17.14
• dependabot/npm_and_yarn/funnel/assets/lodash.template-4.5.0
• dependabot/npm_and_yarn/glob-10.5.0
• dependabot/npm_and_yarn/js-yaml-4.1.1
• dependabot/npm_and_yarn/mermaid-10.9.4
• dependabot/npm_and_yarn/mermaid-11.10.0
• dependabot/npm_and_yarn/multi-8704f2b77c
• dependabot/npm_and_yarn/multi-a14962bbb0
• dependabot/npm_and_yarn/prismjs-1.30.0
• dependabot/npm_and_yarn/semver-6.3.1
• dependabot/npm_and_yarn/tmp-0.2.4
• dependabot/npm_and_yarn/undici-6.21.3
• dependabot/npm_and_yarn/vega-interpreter-1.2.1
• dependabot/npm_and_yarn/word-wrap-1.2.4
• deps-upgrade
• design-fixes
• disable_contact_exchange_post_event
• dlt-entity-id
• docker
• dockerize
• download-contacts
• draft-list-fix
• drop-py37
• dynamicassociationproxy-mapping
• e2e-test
• e2e-tests
• emaiil-mx-test
• email-128bit-hash
• email-bounce-check
• email-case-change
• email-is-available
• email-markup-fix
• email-templates
• email-verify-patch
• emailaddress-fix
• emailaddress-improvements
• embed-video
• emoticons
• env
• env-breaking-tests
• env-config
• event-fix
• ext-rsvp
• fa5
• failsafe_add_session
• featured-schedule-fix
• filter-not-validator
• fix-199
• fix-457
• fix-682
• fix-add-crew
• fix-calendar
• fix-crew
• fix-current-sessions
• fix-cypress-test
• fix-cypress-tests
• fix-cyprss-test
• fix-date-past-project
• fix-e2e
• fix-follow-btn
• fix-funnel-log0
• fix-headline
• fix-label
• fix-live
• fix-login-malformed-email
• fix-map-ui
• fix-matomo
• fix-notification
• fix-project-banner
• fix-project-card
• fix-regex
• fix-report-getone
• fix-review-repeat
• fix-rsvp
• fix-rsvp-btn
• fix-save-form
• fix-schedule-schema
• fix-schedule-sticky
• fix-session-form
• fix-sorting
• fix-spotlight-card
• fix-strings-in-project-model
• fix-style
• fix-submission-preview
• fix-sync-2
• fix-talkfunnel-js
• fix-template
• fix-timezone-cookie
• fix-username-form
• fixes
• flake8
• flask-rq
• flask-rq2
• follow-member
• follower-admin
• follower-query
• form-json-fix
• form-nonce
• forms-get-set
• formtext
• ga4-tag-change
• geoip
• geonames-download
• gha-pytest-webpack
• grapheme
• gunicorn
• handle-deleted
• hasgeekapp
• hasgeekpwa
• hashed-rate-limit-identifier
• hasweb
• header-footer
• hg
• hide-labels-form
• homepage
• homepage-1
• homepage-schedule-fix
• html-in-json
• icon-fix
• idempotent
• img-fix
• imgeefield
• increase-translation-coverage
• inline-title
• invalid-email
• is-break-default
• is_not
• isinstance
• issue-209
• issue-291
• issue-435
• jinja-template-check
• join-btn
• join-fix
• js-refactor
• js-translate
• json-400
• json-access
• json-bx-form
• json-datetime
• label-badge
• label-fix
• labels
• labels-fix
• labels-json
• labelsUI
• lastuser-cleanurl-fix
• license-change
• linked-contacts
• live-project-state
• livestream-url-filter
• load-past
• login-form-tests
• login-page
• login-session-postprocess
• logo-name
• mailer-models
• main
• markdown-escape
• markdown-headings
• markdown-upgrade
• markup-i18n
• master
• matomo-daily-analytics
• matomo-daily-visitors
• matomo-fix
• matomo-mtd
• mdit-plugins
• membership
• membership-homepage
• membership-merge
• membership-section
• membership-verified-email
• membrship-section
• mermaid
• migrations-typing
• minor-css-fix
• minor-fix
• misc-aws-ses
• missing-duration
• mkinit-release
• mnrl
• moar-notifications
• modal-fix
• model-refactor
• model-typing
• modelview-all
• modelview-update
• more-ses
• more-strings
• more-transitions
• moreshell
• move-proposal
• mui
• muicss-webpack
• mypy-fixes
• navbar-search
• never-ending-notifications
• new-comment-email-template
• new-email-otp
• new-participant-verify
• new-profile-page
• new-sms-templates
• new-test
• new-ui-fixes
• new_qr_reader
• newhomepage
• notice
• notification-account-merge
• notification-config-from-typing
• notification-fixes
• notification-mixed-online-offline
• notification-mopup
• notification-template-fix
• notification-updates
• notifications
• notifications-fix
• notifications-frontend-tests
• oauth-patch
• obsolete-dispatch
• offline
• offline-message
• offline_checkin
• offline_new
• opensearch
• opensearch-mimetype
• organizer-ical
• package-lock
• pages
• participant
• participant-emailaddress
• participant-livestream
• participant-post
• participant-role-fix
• password
• password-form-fix
• password-strength
• periodic-sync
• pin-updates
• pip-audit
• placeholder-editor
• playwright
• playwright-e2e
• playwright-timeout
• post-fix
• post-fix-2
• post-fix-3
• post-views
• pre-commit-ci-update-config
• prettier
• prettier-css
• prevent-rsvp-double-submit
• primary-venue
• privacy-banner
• profile-banner
• profile-banner-styling-fix
• profile-change
• profile-description
• profile-filter-fix
• profile-name-fix
• profile-page
• profile-page-update
• profile-tagline
• profile-ui
• profile-videos
• profile-website-field
• project-card-footer-venue-title
• project-header-bugfix
• project-notification-sms-template
• project-page-header
• project-permissions
• project-profile-fields
• project-redirect-fix
• project-redirect-for-profile-change
• project-rename
• project-schedule-bugfix
• project-state
• project_starting_notification_fix
• proposal-admin
• proposal-body
• proposal-comment-json-fix
• proposal-delete-confirm
• proposal-instructions
• proposal-notification
• proposal-part-labels
• proposal-transfer-form
• proposal-ui
• proposal-uuid
• proposals-page
• proposals-pg
• proposer-contact-consent
• proxyfix
• pwa-maskable-icon
• pwa-tabbed
• py3
• pycountry
• pytest-bdd-fix
• pytest-pretty
• pytest-socket
• pytest-style
• pyup-initial-update
• pyup-pin-alembic-0.9.9
• pyup-pin-coverage-4.5.1
• pyup-pin-coveralls-1.3.0
• pyup-pin-flask-1.0.2
• pyup-pin-flask-assets-0.12
• pyup-pin-flask-mail-0.9.1
• pyup-pin-flask-migrate-2.2.0
• pyup-pin-flask-sqlalchemy-2.3.2
• pyup-pin-flask-wtf-0.14.2
• pyup-pin-icalendar-4.0.1
• pyup-pin-nose-1.3.7
• pyup-pin-psycopg2-2.7.4
• pyup-pin-psycopg2-2.7.5
• pyup-pin-pytz-2018.4
• pyup-pin-qrcode-6.0
• pyup-pin-rq-0.11.0
• pyup-pin-six-1.12.0
• pyup-pin-unicodecsv-0.14.1
• pyup-scheduled-update-2019-08-01
• pyup-scheduled-update-2019-10-01
• pyup-scheduled-update-2019-11-01
• pyup-scheduled-update-2020-06-01
• pyup-scheduled-update-2020-07-01
• pyup-scheduled-update-2020-08-01
• pyup-scheduled-update-2020-09-01
• pyup-scheduled-update-2020-11-01
• pyup-update-alembic-0.9.10-to-1.0.0
• pyup-update-alembic-0.9.9-to-0.9.10
• pyup-update-alembic-1.0.0-to-1.0.1
• pyup-update-alembic-1.0.1-to-1.0.2
• pyup-update-alembic-1.0.10-to-1.0.11
• pyup-update-alembic-1.0.2-to-1.0.3
• pyup-update-alembic-1.0.3-to-1.0.4
• pyup-update-alembic-1.0.3-to-1.0.5
• pyup-update-alembic-1.0.5-to-1.0.6
• pyup-update-alembic-1.0.5-to-1.0.7
• pyup-update-alembic-1.0.7-to-1.0.8
• pyup-update-alembic-1.0.8-to-1.0.9
• pyup-update-alembic-1.0.9-to-1.0.10
• pyup-update-coverage-4.5.1-to-4.5.2
• pyup-update-coverage-4.5.2-to-4.5.3
• pyup-update-coveralls-1.3.0-to-1.4.0
• pyup-update-coveralls-1.4.0-to-1.5.0
• pyup-update-coveralls-1.5.0-to-1.5.1
• pyup-update-coveralls-1.5.1-to-1.6.0
• pyup-update-coveralls-1.6.0-to-1.7.0
• pyup-update-coveralls-1.7.0-to-1.8.0
• pyup-update-coveralls-1.8.0-to-1.8.1
• pyup-update-flask-1.0.2-to-1.0.3
• pyup-update-flask-migrate-2.2.0-to-2.2.1
• pyup-update-flask-migrate-2.2.1-to-2.3.0
• pyup-update-flask-migrate-2.3.0-to-2.3.1
• pyup-update-flask-migrate-2.3.1-to-2.4.0
• pyup-update-flask-migrate-2.4.0-to-2.5.0
• pyup-update-flask-migrate-2.5.0-to-2.5.1
• pyup-update-flask-migrate-2.5.1-to-2.5.2
• pyup-update-flask-rq2-18.2.1-to-18.2.2
• pyup-update-flask-rq2-18.2.1-to-18.3
• pyup-update-flask-sqlalchemy-2.3.2-to-2.4.0
• pyup-update-icalendar-4.0.1-to-4.0.2
• pyup-update-icalendar-4.0.2-to-4.0.3
• pyup-update-progressbar2-3.38.0-to-3.39.0
• pyup-update-progressbar2-3.38.0-to-3.39.2
• pyup-update-progressbar2-3.39.2-to-3.39.3
• pyup-update-progressbar2-3.39.3-to-3.41.0
• pyup-update-progressbar2-3.41.0-to-3.42.0
• pyup-update-psycopg2-2.7.5-to-2.7.6
• pyup-update-psycopg2-2.7.5-to-2.7.6.1
• pyup-update-psycopg2-2.7.6.1-to-2.7.7
• pyup-update-psycopg2-2.7.7-to-2.8
• pyup-update-psycopg2-2.7.7-to-2.8.1
• pyup-update-psycopg2-2.8.1-to-2.8.2
• pyup-update-psycopg2-2.8.2-to-2.8.3
• pyup-update-pytest-3.10.1-to-4.0.0
• pyup-update-pytest-4.0.0-to-4.0.1
• pyup-update-pytest-4.0.1-to-4.0.2
• pyup-update-pytest-4.0.1-to-4.1.0
• pyup-update-pytest-4.1.0-to-4.1.1
• pyup-update-pytest-4.1.1-to-4.2.0
• pyup-update-pytest-4.2.0-to-4.2.1
• pyup-update-pytest-4.3.0-to-4.3.1
• pyup-update-pytest-4.3.1-to-4.4.0
• pyup-update-pytest-4.4.0-to-4.4.1
• pyup-update-pytest-4.4.1-to-4.4.2
• pyup-update-pytest-4.4.2-to-4.5.0
• pyup-update-pytest-4.5.0-to-4.6.0
• pyup-update-pytest-4.5.0-to-4.6.1
• pyup-update-pytest-4.6.1-to-4.6.2
• pyup-update-pytest-4.6.2-to-4.6.3
• pyup-update-pytz-2018.4-to-2018.5
• pyup-update-pytz-2018.5-to-2018.6
• pyup-update-pytz-2018.5-to-2018.7
• pyup-update-pytz-2018.7-to-2018.9
• pyup-update-pytz-2018.9-to-2019.1
• pyup-update-qrcode-6.0-to-6.1
• pyup-update-rq-0.11.0-to-0.12.0
• pyup-update-rq-0.12.0-to-0.13.0
• pyup-update-rq-0.13.0-to-1.0
• recaptcha-disabled
• recent-session
• redirect
• redirect-project
• redis-fix
• redis-hmset
• redis-hset-revert
• redis-url
• refs/heads/account
• refs/heads/config-env
• refs/heads/dbmodel
• refs/heads/dynamicmapped
• refs/heads/email-templates
• refs/heads/fix-oauth-expires-at
• refs/heads/main
• refs/heads/phone-number-api
• refs/heads/settings-sample
• refs/heads/status-error
• refs/heads/twitter-account-delete
• register-box-fix
• registration-notification-patch
• reigster-form-fix
• remove-clean
• remove-featured-schedule
• remove-legacy-name
• remove-usergroup
• rename-post-to-update
• render-with-typing
• requires-sudo
• reserved-names
• restrict-video
• return-reformat
• revert-523-homepage
• robots-sitemap
• robots-txt
• rq-dashboard
• rsvp
• rsvp-btn-text
• rsvp-cleanup
• rsvp-email-phone
• rsvp-google-calendar
• sample-env
• save-form-fix
• saved-project-session
• scan
• scan-badge
• scan-checkin
• scan-contact
• scanbadgeui
• scanned-contact-list
• schedule
• schedule-fix
• schedule-fixes
• schedule-header-row
• schedule-mob
• schedule-profile
• schedule-ui-fix
• schedule_json_cors
• search
• search-escape
• search-tab
• search_vector
• select2
• select2-webpack
• seo-fix
• ses-events
• session-cookie-fix
• session-field-featured
• session-role-fix
• session-start-end
• set-featured
• set-org-username
• shoelace-integration-test
• short-title-property
• shortlink-form
• show-location
• show-membership
• show-message-email
• signed-tokens
• sitemap
• sitemap-index
• small-fix
• sms-cleanup
• sms-comment-notification
• sms-notifications-fix
• sms-project-starting-notification
• sms-proposal-notification
• sms-registration-notification
• sms-timing
• sms-update-change
• sms-update-notification
• sns-subscribe-noop
• snyk-fix-e13eae32e746d7472b77ef83b6027ead
• snyk-fix-e3c4c0220ee4e54f8549e1bc45981db6
• snyk-upgrade-90e42b75b1d8bed9f602b58a5b12aa5f
• snyk-upgrade-d83ef6ba20cd3532be70d8dff688a6ed
• socketio
• spa
• sponsor-card-fix
• spotlight-card
• sqlalchemy-unmapped
• state-fix
• state-label-fix
• state-manager
• state-manager-fix
• submissions-close-text
• subproject
• subproject-form
• subprojects-ui
• support-email
• sync-ticket-typing
• system-font
• system-font-fix
• tab-link
• target-blank
• team-orgid
• teamview-mapping
• template-var-truncation
• temporary-fields
• test-fixes-notifications
• test-typing
• testing
• thumbnail-images-model-changes
• thumbnail-images-signal-handler
• ticket-before-membership
• ticket-event-participant
• ticket-participant
• ticket-widget
• tickettype-fix
• timestamptz
• timezone
• timezonetype
• truncate-deadlock
• trusted-client-notifications
• type-hints
• types-all
• typing-and-imports
• typing-and-migrations
• typing-fixes
• ui
• ui-fix
• ui-fix-2
• ui-fixes
• ui-polish
• ui-schedule
• uifixes
• unconfirmed-proposal-fix
• undo-proposal-cancel
• unicodetext
• unpublished-project-ui
• unread-count-fix
• unscheduled-session
• unsubscribe-redirect
• upcoming-with-sessions
• update-email-template-fix
• update-for-members
• updated-baseframe-translations
• updates-to-account
• upgrade-deps
• upgrade-packages
• url-field-length
• url-rewrite
• urlsplit-cleanup
• urltype-check-fix
• urltype-migrate
• user-avatar
• user-fix
• user-link
• user-session-ux
• userfield
• username-available-check
• username-bug
• utm-email-tags
• uuid
• uuid-compare
• vcard
• venue
• venue-description
• venue-fix-mobile
• venue-seq
• video-access
• video-api-fix
• video-loadtime
• vimeo-fix
• vimeo-http-fix
• visibility-state-bugfix
• webpack
• webpack-cache
• webpack-manifest
• withdrawn-patch
• xhr-sudo
• zbase32-decodeerror

Build # 7175

Build Type

Pull #824

travis-ci

Committed by web-flow

Commit Message

Merge 5cf3208e1 into 05e93bfd8

Pull Request Pull Request #824: Fix user merging with team memberships, and add tests

Run Details

1 of 1 new or added line in 1 file covered. (100.0%)

5051 of 9293 relevant lines covered (54.35%)

0.54 hits per line