ocadotechnology / aimmo

77%

master: 75%

LAST BUILD ON BRANCH merge_fix

branch: merge_fix

CHANGE BRANCH

x

Reset

• merge_fix
• 0.1.0
• 0.1.0.b2696
• 0.1.0.b2700
• 0.1.0.b2702
• 0.1.0.b2721
• 0.1.0.b2725
• 0.1.0.b2727
• 0.1.0.b2766
• 0.1.0.b2769
• 0.1.0.b2773
• 0.1.0.b2775
• 0.1.0.b2778
• 0.1.0.b2781
• 0.2.0.b2807
• 0.2.0.b2836
• 0.2.0a0
• 0.2.1.b2856
• 0.2.2
• 0.2.2.b2864
• 0.2.2.b2868
• 0.2.2.b2885
• 0.2.3.b2911
• 0.2.4.b2923
• 0.2.5.b2961
• 0.2.6
• 0.3.0.b2965
• 0.3.0.b2975
• 0.3.0.b2983
• 0.4.0.b3098
• 0.4.2.a3
• AppBar
• CVE-2018-3728
• CelineBoudier-patch-1
• CelineBoudier-patch-2
• Django-1-10
• FogOfWar
• OLAF-QUICK-README-CHANGE
• OlafSzmidt-README-patch
• OlafSzmidt-README-patch-1
• OlafSzmidt-patch-1
• OlafSzmidt-patch-2
• Readme-known-issues
• SarahCovey-patch-1
• Split-Game-Creator-Sathish
• UI_new_design
• Update_usage_instructions
• add_codeclimate
• add_git_templates
• add_logout
• add_materia_design
• add_pylint
• add_style_to_snapshot_tests
• add_unity_to_react
• admin_display
• adstastic-readme-update
• api_refactoring
• architecture_uml
• architecture_uml_docs
• avatar-admin
• avatar_admin
• avatar_marker
• avatar_view
• big_revert
• brand_old_game_page
• building_docker
• buttons
• c-001
• c-002
• catch_invalid_action
• catch_runtime_exceptions
• cell_refactoring
• ci_for_frontend
• cobErrors
• code_editor_frontend
• codeclimate
• configure_eslint
• connect_console_component_to_redux
• console_component
• correct_url_path_port_sockets
• coverage
• coveralls
• create_prometheus_operator
• create_worker_class
• current_avatar
• danalex97-api_refactoring
• dbclear_cpulimits
• default_code
• default_settings
• deploy_env
• deploy_script_gcp
• destructureRename
• development
• django_110
• doc_createShallowWithTheme
• docker_for_local_mode
• docs
• docs-changes
• dont_send_empty_logs
• dont_wait_for_worker_creation
• editor_state_management
• exit_button
• feature/guessLogs
• fix-aimmo-linux
• fix-avatar-admin-display
• fix-port-linux
• fixTests
• fix_804
• fix_admin_avatar_naming
• fix_backend_marker
• fix_django_setup_regression
• fix_ingress
• fix_ingress_v2
• fix_issue_209
• fix_kubernetes_mode
• fix_linting_errors
• fix_local_mode
• fix_minikube
• fix_serialise_errors
• fix_staging
• fix_syntax_error_code_update_bug
• fix_syntax_errors_dissapearing
• fix_travis
• fix_typing_bug
• fix_usage_doc
• fix_vagrant_bug
• functionalTests
• game_layout
• guessLogsFix
• hotfix/0.1.1a0.post0.dev131
• icons
• ie11_fix
• ignore_unity_build_
• increase_turn_interval
• ingress_deployment
• initial_refactoring_erorr
• integrate_react_with_django
• integrate_socket_io_with_react
• integration_tests
• issue-421
• joshuablake-multiple_games
• kubernetes-on-windows-fixes
• kubesecIO
• leaking_structures
• levels
• local_mode_games_not_working
• logsTestsFrontend
• longertimeout
• macos_minikube_fix
• make_readme_prettier
• master
• minikube-run-start
• minikube_infra_update
• minikube_kubernates_tests
• minor_pep8
• minor_yaml_replace_change
• mmo_logic
• move_logic_outside_world_map
• new_design_into_master
• new_tests_for_dead_avatar
• not-working
• oserror
• pep8
• pipenv
• pipfile_containers
• postCodeButton
• quick_import_fix
• quickfix_673
• raphaeljs_comeback
• react_in_prod
• react_integration
• readme-update
• readme_update
• refactor_doc
• refactor_game_service
• refactoring
• remove_ghibli
• remove_manual_deploy
• remove_non_user_code_traceback
• remove_pykube_dependency
• remove_setuptest
• remove_simulation_logic_from_worker_manager
• remove_vagrant
• rename_players_to_aimmo
• riaJha97-patch-1
• save_logs
• send_logs_from_worker
• sid_to_avatarID_mutation
• snackbar
• snyk-fix-80f2jo
• socket_event_for_new_code
• srcElement_fix
• stale_integration
• stop_killing_workers
• stop_turn_slowdown
• stupid_mistake
• task_issue_template
• test_migration_issue
• tests
• tests/guessLogs
• tests_for_avatar_with_dead_worker
• tests_for_dead_avatar
• tests_for_worker_class
• turn_manager_simulation
• typography
• ubuntu_setup
• unintended_games
• unity
• up_to_python3_in_containers
• update-Development
• update-development
• updateButtons
• updateUML
• update_k8s_client
• update_pipfile_lock
• updated-development
• updated_development
• upgrade_deps_and_snapshot
• upgrade_django
• upgrade_redux_deps
• upgrade_rxjs
• user_id
• v0.1-alpha
• v0.1.1-alpha
• vagrant
• versions
• webgl_integration
• worker_bots
• worker_owners
• write_setup_script_linux
• write_setup_script_mac
• zoom_code

Build # 652

Build Type

push

travis-ci

Committed by danalex97

Commit Message

Fixed the merge confilicts resulted from mergeing at the same time: #222 and #223.

Run Details

1716 of 2234 relevant lines covered (76.81%)

0.77 hits per line