AndelaOSP / art-backend

84%

develop: 91%

LAST BUILD ON BRANCH ft-better-message-on-slack-art-bot-#162382954

branch: ft-better-message-on-slack-art-bot-#162382954

CHANGE BRANCH

x

Reset

• ft-better-message-on-slack-art-bot-#162382954
• 157113826-code-refactor
• 157368030-lines-missed-during-cleanup
• 157393804-user-object-for-assigned-to
• 157594844-additional-logging
• 159470288-set-default-asset-limit
• 159494305-release-notes
• 160017280-uuid-on-asset-model
• 161948300-custom-attributes-in-token
• 162152525-refactor-post-saves
• 162152547-162152525-refactor-and-bugs-fix
• 162157017-refactor-tests
• 162984335-cleanup
• 162984335-cleanup-dotenv
• 162984335-cleanup-final
• 162984335-more-refactor
• 163194669-save-security-user-location
• 163726521-asset-filter
• 163755285-circle-coverage
• 164894881-export-query-params
• 164982314-track-user-sync-changes
• 165023940-asset-import
• 165027516-test-uwsgi
• 165414639-remove-security-user-model
• Filter-asset-logs-categorizations-166407025
• HEAD
• add-migrations-to-pipeline-159553715
• bg-double-asset-log-#164726859
• bg-fix-all-assets-allocated-157803270
• bg-fix-createsuperuser-cohort-error-158761695
• bg-fix-display-asset-model-number-157394192
• bg-fix-false-skipped-assets
• bg-fix-false-skipped-assets#162539794
• bg-make-purchase_date-optional-159242289
• bg-missed-related-fields-display-#159168982
• bg-return-cohorts-in-sorted-manner#162375571
• bg-return-sorted-cohorts#162375571
• bg-unique-validation-#158792069
• ch-add-api-documentation-157551217
• ch-add-cors-origin-158946377
• ch-adjust-sample-import-file-165631654
• ch-automate-local-setup
• ch-consitent-string-format-#165851330
• ch-copy-edits-for-consistency-156990435
• ch-cronjob-image-update-162965500
• ch-fix-allowed-hosts-issue-158946377
• ch-fix-problem-with-apt-CCI
• ch-implement-ci-cd-156802464
• ch-initial-ci-cd
• ch-modify-configuration-files-158689106
• ch-refactor-asset-files-import-#158254308
• ch-rename-item-to-asset-156704243
• ch-restrict-docs-to-staging-160194424
• ch-set-up-production-159269808
• ch-sync-users-on-ais-to-art#160246264
• ch-update-allowed-hosts-158946377
• ch-update-readme-#156755804
• ch-upgrade-django-160983018
• chore-devops-changes
• coverage-without-nose
• debug-on-heroku
• develop
• develop-sandbox
• feat-allow-pagination-on-api-endpoints-#158555572
• feat-pagination-enhancement-#158792993
• feat-security-team-can-log-asset-checkin-checkout-155922721
• fetch-asset-bug
• fix-asset-logs-admin-display-156990322
• fix-cors-issue-160340432
• fix-deployment
• fix-django-jet
• fix-gunicorn-159759006
• fix-make-assigned-to-optional-156157275
• fix-security-password-optional-156990530
• fix-whitenoise-module
• ft-Admin-can-add/view-user-group-via-api-#159022582
• ft-Admin-can-change-security-user-status
• ft-Admin-can-see-the-number-of-assets-assigned-to-a-user
• ft-An-admin-can-edit-and-delete-a-security-user-#161049350
• ft-Asset-Types-has-Specs-field
• ft-User-should-have-a-location-field-#160725176
• ft-add-asset-specs-158853569
• ft-add-custom-auth-for-api-request-156224169
• ft-add-email-for-security-users-156224442
• ft-add-import-script-help-text-158254668
• ft-add-security-team-155922716
• ft-add-view-floor-section-#159022587
• ft-additional-fields-for-assets-endpoint-#158919773
• ft-admin-can-add-andela-centres-#160725081
• ft-admin-can-view-all-assets-via-api-157682134
• ft-admin-create-api-users-156572526
• ft-admin-data-view-160726559
• ft-admin-filter-assets-by-asset-status#160192826
• ft-admin-user-can-add-security-user-via-api-157912326
• ft-allocation-logs-specific-asset-157353629
• ft-asset-assignee-#160128992
• ft-asset-code-on-slack-notification
• ft-asset-condition-model-157183398
• ft-asset-invoice-receipts-pdf-165377092
• ft-asset-specs-unique-together-validation-159022584
• ft-asset-status
• ft-assets-assigned-to-departments-#159022596
• ft-assign-asset-to-workspace-159022595
• ft-assign-assets-to-departments#159022596
• ft-assigner-history-166114088
• ft-assignment-api-#157103978
• ft-change-asset-owner-to-none-157183400
• ft-change-asset-status-to-allocated-157183402
• ft-change-asset-verification-status#162050857
• ft-closed-incident-report-164101493
• ft-create-and-view-subcategory-via-api
• ft-create-asset-specs-via-api-158853577
• ft-create-skipped-record-file-#158254416
• ft-create-view-asset-model-number-via-api-157396331
• ft-create-view-asset-type-via-api-#157396329
• ft-customize-admin-interface-#15532212
• ft-deallocation-text-slack
• ft-default-ordering-for-models
• ft-django-slack-integration-157183403
• ft-endpoint-for-filter-values#162236652
• ft-feedback-on-admin-dashboard-157051832
• ft-field-unique-validations-#159077504
• ft-filter-verified-and-unverified-assets
• ft-filters-for-assets-156990474
• ft-host-sample-csv-file#162420939
• ft-implement-asset-filter-by-email-157426958
• ft-import-asset-categories-into-system-155922722
• ft-import-asset-model-numbers-into-the-system-158110819
• ft-import-asset-type-155922723
• ft-import-file-from-url-158254542
• ft-importing-users-into-the-system-#158255098
• ft-incidence-report-contain-user-159023262
• ft-list-security-users-156267228
• ft-mark-asset-as-unverified#162050857
• ft-modify-asset-details-api-response-156729821
• ft-modify-asset-specs-condition-159023098
• ft-notofications-endpoint-160192851
• ft-optional-password-field-156877577
• ft-partial-update-status-#155922720
• ft-performance-profiling-155322126
• ft-refactor-relations-display-159112548
• ft-remove-to-field-usage-158757556
• ft-see-asset-type-from-api-157394141
• ft-show-categorization-asset-logs-response-166728438
• ft-split-assets-endpoint-158613104
• ft-total-asset-by-status-#157183397
• ft-track-asset-assignment-#157052270
• ft-update-user-feedback-feature-#160196894
• ft-user-add-asset-date-#15886823
• ft-user-add-floor-sections-#159022586
• ft-user-add-workspace-#159022588
• ft-user-can-add-assets-via-api-157396332
• ft-user-can-import-asset-makes-155922724
• ft-user-can-see-create-view-categories-via-api-157396327
• ft-user-can-see-details-specific-asset-#155922719
• ft-user-can-submit-an-incident-report-model-157183717
• ft-user-can-submit-an-incident-report-via-api-157249689
• ft-user-can-track-item-status-via-api-157103974
• ft-user-feedback-156725831
• ft-user-import-assets-155922725
• ft-user-view-assets-via-api-155922718
• ft-view-assets-assigned-to-a-user#160109109
• ft-view-condition-notes-on-manage-assets-endpoint-#159022583
• get-asset-by-user-167424021
• import-tweaks
• master
• migration-asset
• migrations-sandbox
• minor-refactor
• prod-sandbox
• refactor-get-hosts-#160340432
• remove-security-user-model
• remove-unnecessary-boolean-logic-167009953
• revert-151-ft-performance-profiling-155322126
• serial-assetcode-log-filter-#164802372
• show-categorization-asset-logs-response-166728438
• test-cors
• test-gunicorn
• test-host-ips
• trigger-user-sync-manually
• tweak-release-note-generation
• tweak-slack-message
• update-dockerfile
• update_host_ips
• use-psycopg2-binary
• user-sync-secondary-url

[#162382954]Resolved merge conflict.