HabitRPG / habitrpg

52%

develop: 52%

LAST BUILD ON BRANCH 3.0.0

branch: 3.0.0

CHANGE BRANCH

x

Reset

• 3.0.0
• 3.40.0
• AnitaYCheng-conditional-buy-gem
• Hus274-7767
• MathWhiz-translatable-wikia-links
• TheHollidayInn-push-noitifications-fcm
• adjustments_to_group_front_end_only
• adjustments_to_quests_pr
• allow_users_to_leave_quest_that_has_not_started
• analytics-service-server-side
• api-v3
• api-v3-client
• aws_gulp_task
• blade-Finish_weeklies_pr
• blade-feature/search
• change_custom_day_start
• common_reorg
• conditional-buy-gem
• develop
• emails
• faq_fix
• feature_quest_invite_modal_on_user_sync
• fix-drops-languages
• fix_broken_challenges
• fix_content_refactor
• fix_contributor_levels_watch
• fix_customizations_bug
• fix_stat_allocation_bug
• fix_tutorial_flag
• flag_adjustments
• flag_email_refactor
• greenkeeper-grunt-contrib-clean-0.7.0
• gulp-ify-start
• gulp_build
• gulpify
• hairlessbear-pending_quest_display
• image-min
• inventory_sorting_debug
• item_store_fix
• js_ify_common
• lefnire/t-c/array
• lefnire/t-c/shared
• lint
• markdown_rework
• mock_develop
• modularize-content-gear
• new-history-preening
• new_relic
• ngrepeat-trackby
• oauth2-2015-01-10
• paglias/amazon-payments
• paglias/better-logging
• paglias/deprecate-v2
• paglias/eb-npm-3
• paglias/express-4
• paglias/firebase
• paglias/firebase-requirements
• paglias/fix-double-cron
• paglias/fix-redirect-no-localstorage
• paglias/loading-times
• paglias/loggly
• paglias/portuguese
• paglias/realtime-chat
• paglias/realtime-chat-v1
• paglias/remove-eb
• paglias/remove-localstorage
• paglias/rename-folders
• paglias/reorg-client
• paglias/set-last-cron-beginning
• paglias/tasks-collection
• paglias/tips
• paglias/user-virtual-props
• paglias/v3-fix-get-groups-types
• paglias/v3-ops
• paglias/vue-setup
• party_page
• pin-versions
• querry43-inventory-sorting
• rDOgrifQ_front_page_loading
• recovery
• refactor-content
• release-june-30th-2015
• revert-5396-remove_freeRebirth
• revert-5407-GSalvadi-audio-NOMINDTR-2015-06-15
• revert-5912-group-remove-party-invites-when-last-member-leaves
• revert-5943-revert-5912-group-remove-party-invites-when-last-member-leaves
• revert-7801-revert-7761-paglias/deprecate-v2
• revert_task_cancel_pr
• rosstavo_audio_theme
• sabrecat/Move-Overview-To-Website
• sabrecat/ab-test-fixes
• sabrecat/ab-test-sound
• sabrecat/active-handles
• sabrecat/analytics-fixes
• sabrecat/analytics-service
• sabrecat/apps-page
• sabrecat/armoire-201508
• sabrecat/armoire-201510
• sabrecat/armoire-201601
• sabrecat/armoire-201602
• sabrecat/armoire-201603
• sabrecat/armoire-201604
• sabrecat/armoire-201605
• sabrecat/armoire-201606
• sabrecat/armoire-201607
• sabrecat/armoire-201608
• sabrecat/armoire-201609
• sabrecat/august-mystery
• sabrecat/august-mystery-mystery
• sabrecat/august-pet
• sabrecat/automatic-restart
• sabrecat/avatar-sharing
• sabrecat/backgrounds-201510
• sabrecat/bailey-20160729
• sabrecat/bailey-timestamp
• sabrecat/bears
• sabrecat/birthday-2016
• sabrecat/buyMystery-test
• sabrecat/buyMysterySet-test
• sabrecat/chal-checklist
• sabrecat/chat-cutoff
• sabrecat/conditional-buy-gem
• sabrecat/content-201509
• sabrecat/content-201511
• sabrecat/costume-awards
• sabrecat/daily-tests
• sabrecat/death-modal
• sabrecat/derby-day
• sabrecat/docker
• sabrecat/eb-timeout
• sabrecat/elastic-beanstalk
• sabrecat/enable-drops-sooner
• sabrecat/end-wonderland
• sabrecat/fall-2015
• sabrecat/faq
• sabrecat/fb-analytics
• sabrecat/fix-3mo-benefits
• sabrecat/fix-chair-display
• sabrecat/fix-mount-modal
• sabrecat/fix-mystery-award
• sabrecat/fix-newbie-guild
• sabrecat/fix-persistent-tags
• sabrecat/fix-randomness
• sabrecat/fix-rehatch-modal
• sabrecat/fix-unsub-analytics
• sabrecat/floral-mystery
• sabrecat/focusme-subscription
• sabrecat/ga-experiments
• sabrecat/gift-sub-fix
• sabrecat/glasses-chairs
• sabrecat/greeting-cards
• sabrecat/habitica-day
• sabrecat/habitoween
• sabrecat/halloween-mount
• sabrecat/heap-analytics
• sabrecat/invite-friends-experiment
• sabrecat/leslie-hiatus
• sabrecat/leslie-returns
• sabrecat/login-incentives
• sabrecat/magic-potions
• sabrecat/maintenance-announcement
• sabrecat/market-fix
• sabrecat/migrations
• sabrecat/modal-warnings
• sabrecat/modals-fixes
• sabrecat/modularize-codeHelpers
• sabrecat/modularize-statHelpers
• sabrecat/monthlies
• sabrecat/more-modals
• sabrecat/mystery
• sabrecat/mystery-201510
• sabrecat/mystery-201601
• sabrecat/mystery-201602
• sabrecat/mystery-201603
• sabrecat/mystery-201605
• sabrecat/mystery-201606
• sabrecat/mystery-201607
• sabrecat/mystery-201608
• sabrecat/naming-2016
• sabrecat/naming-content
• sabrecat/no-crit-watch
• sabrecat/no-drop-watch
• sabrecat/nye2015
• sabrecat/onboarding-tweaks
• sabrecat/party-analytics
• sabrecat/party-page
• sabrecat/paypal-descs
• sabrecat/peppermint-pets
• sabrecat/pet-201509
• sabrecat/pet-201511
• sabrecat/pets-201510
• sabrecat/pets-201512
• sabrecat/pets-201601
• sabrecat/pets-201602
• sabrecat/pets-201604
• sabrecat/pets-201605
• sabrecat/pets-201606
• sabrecat/pets-201607
• sabrecat/pets-201608
• sabrecat/pin-zocial
• sabrecat/prefs-undefined
• sabrecat/quest-analytics
• sabrecat/quest-notifications
• sabrecat/quest-rewards
• sabrecat/quests-page
• sabrecat/remove-browserquest
• sabrecat/shrinkwrap
• sabrecat/shrinkwrap-tweak
• sabrecat/social-buttons
• sabrecat/splash-contd
• sabrecat/spring-2016
• sabrecat/spring-boss
• sabrecat/sprites-url
• sabrecat/subscriber-201512
• sabrecat/subscription-tweaks
• sabrecat/summer-2016
• sabrecat/summer-splash
• sabrecat/summer2016-end
• sabrecat/takeThis-canOwn
• sabrecat/takethis
• sabrecat/thanksgiving
• sabrecat/thunderstorm
• sabrecat/timetravel-stable
• sabrecat/timetravelers-201602
• sabrecat/timetravelers-201602-alt
• sabrecat/v3-maintenance
• sabrecat/veteran-pets
• sabrecat/winter-wonderland
• sabrecat/world-boss
• select-tasks-with-keys
• send_flags_to_slack
• slow_chat
• smart_banner
• split-shared
• sprite_test
• task_edit_fix
• tasks-collection
• travis_fix
• unflag_email
• update-node-version
• update_pageres
• upgrade-stack
• upgrade_dependencies
• upgrade_express
• upgrade_mongoose
• upgrade_node
• use_base_url_for_redirect
• use_local_modules
• use_node_v4
• user_collection_data
• v3.0.0
• v3.0.1
• v3.0.2
• v3.1.0
• v3.1.1
• v3.1.2
• v3.11.0
• v3.12.0
• v3.12.1
• v3.13.0
• v3.14.0
• v3.15.0
• v3.16.0
• v3.17.0
• v3.18.0
• v3.2.0
• v3.20.0
• v3.21.0
• v3.21.1
• v3.22.1
• v3.23.0
• v3.23.1
• v3.24.0
• v3.24.1
• v3.25.0
• v3.25.1
• v3.25.2
• v3.25.3
• v3.26.0
• v3.27.0
• v3.28.0
• v3.29.0
• v3.29.1
• v3.3.0
• v3.3.1
• v3.3.2
• v3.3.3
• v3.3.4
• v3.30.0
• v3.30.1
• v3.30.2
• v3.31.0
• v3.33.0
• v3.33.1
• v3.34.0
• v3.34.1
• v3.35.0
• v3.36.1
• v3.37.0
• v3.38.0
• v3.39.0
• v3.39.1
• v3.4.0
• v3.4.1
• v3.4.2
• v3.4.3
• v3.4.4
• v3.40.0
• v3.41.0
• v3.41.1
• v3.41.2
• v3.41.3
• v3.41.4
• v3.5.0
• v3.6.0
• v3.6.1
• v3.7.0
• v3.7.1
• v3.7.2
• v3.7.3
• v3.8.0
• v3.8.1
• v3.9.0
• v3_mocha
• vIiRuS-push
• webhook_improvements
• wheelchair

Build # 9801

Build Type

push

travis-ci

Committed by crookedneighbor

Commit Message

Merge pull request #7441 from crookedneighbor/merge_v3_correctly

Merge v3 correctly

Run Details

1501 of 2896 relevant lines covered (51.83%)

18.31 hits per line