projecthydra / sufia

95%

master: 98%

LAST BUILD ON BRANCH merge_config

branch: merge_config

CHANGE BRANCH

x

Reset

• merge_config
• 1575-tos-agreement-path
• 1583-toolbar
• 1588-remove-setup-mail
• 1784-psuisms
• 1906-catch-all-404
• 1939
• 1987_tech_debt
• 2051
• 2060-add-shoulda-matcher-to-rspec
• 2064-raise-locale-key-errors
• 2064-untranslated-key
• 2388-sharingbuttons
• 2415-highlighted-works-padding
• 2449-tab-icons
• 2453
• 2470-my-highlights
• 2472-related-url-display
• 2485-no-followers
• 2616-mediated-objects-inactive
• 2617-set-object-active
• 2627-mediated-user-notification
• 2628-mediated-deposit
• 2633-admin-set-works-count
• 3032
• 3068_3048
• 3128-port-hyrax-admin-set-delete
• 6.0-stable
• 6.x-default-metadata
• 6.x-duplicate-labels
• 6.x-hydra-head-9.5
• 6.x-hydra-head-9.6
• 6.x-proxy-display
• 6.x-rubocop
• 6.x-stable
• 7-1-stable
• 7.2-migration
• 7.3-stable
• 7.4-experiment
• 8-devel
• FIX_1583-add_toolbar
• ability_no_gw
• about_content_block
• action
• add-files-button
• add_arkivo_api
• add_codeclimate_config
• add_file_to_work
• add_files_button
• add_files_to_add_works_2125
• add_folder_uploads
• add_install_template
• add_pry_byebug
• add_release_to_adminset
• add_spanish
• add_upload_sets
• adding-rake-task
• additional-fields-button
• admin-color-update
• admin-dashboard
• admin-editor
• admin_abilities
• admin_breadcrumbs_i18n
• admin_collections
• admin_page
• admin_set_creator
• admin_set_list
• admin_set_management
• admin_set_participants_fieldset_should_not_flow_off_screen
• admin_set_perms
• admin_set_restrict_release
• admin_set_restrict_visibility
• admin_set_search_builder
• admin_set_show
• admin_set_thumbnail
• admin_set_visibility_template
• admin_sets
• admin_sidebar
• admin_stats_resourceful
• adminset_workflow_clean
• adminset_workflows
• af-9.2
• af9.8
• af_9.2.0.rc1
• af_9.2.0.rc2
• after-create-message
• agreement_checkbox
• agreement_javascript
• agreement_required
• all_presenters
• allow_no_permissions
• allow_orcid_check_digit
• allow_overriding_solr_terms_component_path
• almond_dependency
• analytics_unconfigured
• application_name
• arkivio_work_type
• arkivo_api_use_body_not_params
• at_0.11
• attach_s3_files
• atz
• authorize_admin_page
• auto-link
• auto-link2
• avoid_deprecated_af_method
• avoid_deprecation
• backport_default_admin_set_task_3098
• backport_of_3164
• backport_workflow_changes
• banner_image_helper
• based-near-#2401
• batch-create
• batch-edit
• batch-edit-resource
• batch-edit-test
• batch-job
• batch-up-multi-res-type
• batch_create_work_type
• batch_edit_gw
• batch_edit_spec
• batch_file_names
• batch_form
• batch_operations_logging
• batch_upload
• batch_upload_type
• be-fix
• be-integration
• behaviorize_content_blocks_helper
• better_errors
• bl6.6
• blacklight-6
• blacklight_6.5
• bookmarks-table-updates
• bootstrap-aside
• bootstrap-brand-bar
• bootstrap-nav
• bootstrap_smallboxes
• breadcrumbs
• break_locales_into_multiple_files
• browse-everything-v0.10
• browse_everything
• browse_everything_config_nil
• browse_everything_generators
• browse_everything_partial_should_check
• browser_validations
• bubble_up_badges
• bump_cc
• bump_hydra_head
• bump_oauth2
• bump_to_7.3.rc1
• bump_to_7.3.rc2
• buttonize_add_works_link
• buttons
• bye_work_solr_doc
• byebye_sufia_models
• calling-parent
• capability_list
• cc-0.10
• cc-beta3
• cc_0.14.0.pre3
• cc_0.4
• cc_1.7.1
• cc_admin_dashboard
• cc_master
• cc_pre5
• cc_subtree
• cc_users_should_not_be_required
• change-depositor
• check_if_element_exists_before_calling_length_3142
• choose_work_header
• clean-up
• clean_gemspec
• cleanup
• cleanup_test
• cleanup_views
• clickable-collection-icon
• clickable-whitespace
• collection
• collection-builder
• collection-cleanup
• collection-exe
• collection-identifier
• collection-show-bootlint
• collection-translator
• collection_create_layout
• collection_desc
• collection_facets
• collection_icon
• collection_icon_2408
• collection_icon_gallery
• collection_ids
• collection_items_details
• collection_sharing
• collection_show_titles
• collection_visibility
• collections
• collections_sharing
• collections_statistics
• collections_visibility
• comment_default
• config-file
• config-file-specs-only
• configure_banner
• configure_code_climate
• configure_coveralls
• configure_work_type
• consolidate-layouts
• consolidate_tests
• contact-form
• contact_form
• content_block_concern
• contextual-link
• contributor-search-index
• copyright-year
• coveralls
• create_admin_sets
• create_convenience_methods_for_content_blocks
• creating_admin_sets_broken_3161
• css_order
• curation_concerning
• curation_concerns_version
• curation_concerns_version2
• dashboard-bootlint
• dashboard-i18n
• dashboard-theme
• dashboard_consistency
• date-import
• dec_int
• deduplicate_upload_templates
• default-bootstrap
• default-hover-focus
• default_admin_set
• default_icons
• default_language
• default_work_date_uploaded
• delete_admin_set
• delete_collection_2447
• delete_cruft
• delete_files
• deprecated_indifferent_access
• deprecated_search_builder
• derivatives-path
• description-style
• descriptions
• devise-dep
• do_not_copy_extra_solr_configs
• do_not_depend_upon_bl6_yet
• do_not_duplicate_configs_in_new_installs
• do_not_include_hbe_routes_twice
• doc-stable-branch
• documentation
• dont_default_rights
• dont_do_what_cc_does
• double_carets_#3083
• dump_other_useless_file
• dup-rights
• dynamic_cancel_button
• earlier_coverage
• edit_admin_set
• edit_button
• edit_cancel
• embargo-lease-dates
• enable_all_resource_type_buttons_in_batch_3031
• encapsulate_icons
• endnote-download
• endnote-export
• engine_cart_1.0
• err_export
• export_as_openurl_ctx_kev
• expose_read_api
• expose_work_type
• extend_admin_sets
• fail_early
• fcrepo_bump
• fcrepo_wrapper_test_config
• feature/HideWorkFromSearchResults
• feature_test
• featured_works
• features
• fedora-4.2
• fedora-4.3
• fedora-4.4
• fedora-free-file-set
• file-label
• file-manager
• file-presenter
• file-upload
• file_breadcrumb
• file_minter
• file_set_dropdowns
• file_set_show
• file_set_title
• filename
• fileset_edit_page
• fileset_edit_title
• fileupload
• filter_for_works
• filter_type
• filter_users
• find_collections
• find_one
• find_using_work_relation
• find_work_partial
• fix-builders
• fix-config
• fix-dependency
• fix-file-upload-word-wrap
• fix-import-link
• fix-import-param
• fix-redis
• fix-select-all-works
• fix-test-for-new-cc-release
• fix-upload-set-form
• fix/#3043_citation_bug
• fix1487-upload_to_collection_error
• fix1518_fail_to_create_col_facet
• fix_1324_lock_collection
• fix_2175
• fix_3153
• fix_404
• fix_actor_signature
• fix_batch_edit
• fix_batch_permissions
• fix_batch_upload
• fix_blacklight_deprecation
• fix_broken_links_filesets
• fix_characterization
• fix_citation_ability
• fix_collection_size
• fix_collections
• fix_constant
• fix_css
• fix_csv_export
• fix_datatable
• fix_edit
• fix_facet_more
• fix_featured_works
• fix_fedora_warning
• fix_for_relocated_notifications
• fix_help_text
• fix_help_text_config
• fix_html
• fix_i18n
• fix_indent
• fix_links
• fix_no_method
• fix_options
• fix_rubocop
• fix_shares_controller
• fix_solr_config
• fix_stats
• fix_styles
• fix_sufia
• fix_tabs
• fix_test
• fix_translations
• fix_typo
• fix_underline
• fix_upload_turbolinks
• fix_warning
• flip
• flipflop
• flot
• footer
• for_awead
• form_builder
• forms_type
• from_field
• fw-migration
• fw-work
• ga-config
• generate_solr_config
• generate_work_i18n
• getting-started-updates
• gf-translator
• google-api
• google_api
• grant_edit_actor
• guard_nil
• guard_zotero_reference
• handle_integers
• has_link_assertion
• header_edit
• headers
• headings-font-family
• help_double_quotes
• help_the_helper
• hide-marketing
• hide_admin_set_viewers_and_managers
• hide_share_form
• highlight_work
• highlight_work_todo
• homepage-solr
• homepage_details
• html5-date
• human-readable-dates
• human-readable-upload-mod
• human_name
• human_readable_works
• hydra-server
• i18n
• i18n-config
• i18n_cleanup
• i18n_work_form
• i18n_works
• import-docs
• import-exe
• import-fix-rights
• import_s6
• import_url_log
• improve_redis_namespacing
• in_memory_minter
• include_in_class
• increase_coverage
• increase_testing_coverage
• increase_timeouts_to_avoid_capybara_timeouts
• index_facet_link_helper
• indexer_as_class_attr
• install_comment_cleanup
• install_template
• installation_should_load_default_workflows
• isolate_namespace
• issue#2891
• jasmine_support
• jcoyne-patch-1
• jquery-db
• js-fixes
• justins_tests
• last_route
• last_saved
• latest_cc
• latest_hydra_head
• lato-light
• legacy_routes
• legato-initializer
• libreoffice
• license_service
• link_to_agreement
• link_to_works
• linkify_works_in_wf_notifications_3140
• links_textarea
• list_admin_set
• list_search_builder
• little_fixes
• load_language
• load_uploaded_files_from_filesystem_cache_when_fedora_is_down
• load_work
• local-prefixes
• local_prefixes
• lock_batch_find_or_create_1362
• login
• long_ids
• mail_form
• mail_form_deliver
• margins
• masonry-slide-#2408
• master
• masthead
• masthead-bootlint
• masthead-css
• masthead-margins
• masthead-nav-search
• masthead_header/nav
• mde_notifications
• mde_notify
• mde_sufia_wf
• mde_working
• mediated_deposit_epic
• merge_specs
• migration_to_sufia7
• migrations
• migrations_to_work
• minor_cleanup
• minter-file
• mjgiarlo-patch-1
• moar_labelz_and_fix_typo
• mobile-save-widget
• modularize_js
• monitor_spec
• move-to-config
• move_admin_set
• move_admin_set_to_rels
• move_error_routes
• move_spec
• multi_value_fields
• my-i18n
• my-shares-test
• my_highlights
• navbar-margin
• new-work-bootlint
• new_layout
• new_upload
• njaffer-file_set_show_page
• no_change
• no_classes
• no_coverage
• no_edit_workflow
• no_empty_roles
• no_exception_flow_control
• no_fl_count
• no_hard_code_attributes
• no_hardcode
• no_hardcode_path
• no_hardcode_paths
• no_monkey_patch
• no_more_irc_notifications
• no_pull
• no_spellcheck
• no_title
• no_work
• notification_seconds
• notifications-check
• notifications_delete
• nuke-files-controller
• obey_latest_rubocop
• on_behalf_of
• on_the_event_horizon_1437
• one_test_per_class
• only_permit_editable
• optimistic_locking
• optimize_test
• override-batch-update-job
• page_title
• pass_file
• pass_model
• passive-agreement
• pend_failures
• permission_template
• permission_template_null
• permissions_confirm
• permissions_helper
• pin-cc-1.6
• pin-cc-1.7.0.beta1
• pin_blacklight
• pin_bundler
• pin_engine_cart
• point_at_cc_master
• positiioning-css
• precompile_assets
• prefer-array-wrap-to-array
• prefer_do_end
• prep_730rc3
• presenter-test
• presenter_terms
• preserve_sharing
• prevent_submit
• prevent_submit_of_modal_until_type_selected_3135
• primary_type_header
• private
• prod_travis
• prune
• prune_unused_selectors
• pruning
• public
• qa
• query_service
• queue_collapse
• radio_select
• rails5
• randalldfloyd-2628-mediated-deposit
• readable-dates
• readme
• readme_derivatives
• readme_links
• red-test-builders
• redirect_after_upload
• redirect_deprecation
• redirect_to_my_works_after_delete
• redis
• redis-event-store
• reduce_duplication_in_codebase
• refactor_admin_stats
• refactor_ajax_tests
• refactor_analytics
• refactor_controller
• refactor_js
• refactor_local_authority
• refactor_notifications
• refactor_statistics
• refactor_test
• refactor_views
• refactor_views2
• refactoring-large-methods
• register_authorities
• related-url-works
• remote-uri
• remov_libraries
• remove-delete-partial
• remove-deprecation-warnings
• remove-explicit-blacklight
• remove-lato
• remove-page-positioner
• remove-partial
• remove-tagcloud
• remove-unused-spec-support
• remove-variables
• remove_admin_stat
• remove_advanced
• remove_ajax
• remove_blacklight_override
• remove_blacklight_scss
• remove_buttons
• remove_collection_show
• remove_collections
• remove_content_id
• remove_current_user
• remove_dead_code
• remove_deprecation
• remove_deprecations
• remove_directory
• remove_download_link_in_work_show_page
• remove_dup
• remove_duplicate_test
• remove_duplicated_block
• remove_duplication
• remove_email_address
• remove_exclude
• remove_export
• remove_extra_include
• remove_fits_mapping
• remove_generic_route
• remove_grant_edit_actor
• remove_group_list
• remove_has_access
• remove_header
• remove_inputs
• remove_mediated_deposit_flipper
• remove_messages
• remove_migrate_task
• remove_migration
• remove_partial
• remove_permissions_controller
• remove_queue
• remove_related_files
• remove_require
• remove_rights_modal
• remove_role_mapper
• remove_spec
• remove_test
• remove_unnecessary_afnoid_spec_override
• remove_unnecessary_override
• remove_unused
• remove_unused_helper
• remove_unused_path
• remove_unused_routes
• remove_unused_templates
• remove_upload_set
• remove_views
• remove_well
• remove_work_route
• remove_worthwhile
• remove_wrapper
• removing-exclusions-that-do-not-exist
• rename-fscb
• rename-my-files
• rename_batch_upload_item
• rename_collections
• rename_stylesheet
• rename_users
• representative_media
• require-collection-title
• required_fields
• rescan_required
• resize_thumbnails
• resource_type_can_be_empty_3132
• resource_type_on_upload
• resource_type_service
• resque_doc
• restore_single_use_links
• restyle_show_page
• resync
• revert-1326-posix-spawn
• revert_pin
• rewrite_autocomplete
• rights-label-spec
• rights-labels
• rm_admin_user
• rm_dead_code
• rm_ivar
• rm_layout
• rm_records
• root_path
• route-priorities
• rpsec_DRY
• rspec
• rspec-performance
• rubocop
• rubocop-rspec
• rubocop_changes
• rubocop_rspec
• rubocopped
• same_depositor_everywhere
• save_form
• scm-2131
• scm_2128
• scm_2132
• scm_2133
• scm_2136
• scm_2147
• scm_2152
• scm_2155
• search_fields
• search_for_user
• search_results_linked_metadata
• search_state
• second_concern
• send-msg-to-proxies
• sender_comment
• separate_flot
• sequential-uploads
• share_link
• share_tab
• share_with
• shared_footer
• shoryuken
• show-items
• show_actions_auth
• show_admin_set
• show_banner
• showpage_workflow
• signet
• silence-rubocop
• simplify
• single-collection-title
• single-step-with-depositor-review
• single-use-links
• single_batch
• single_use_link
• single_valued_rights_field_1287
• skip-listen
• skip_workflow_if_mediated_deposit_off
• slay_hardcoded_nav_paths
• sleep
• small_thumbnail
• social_media
• solr
• solrize_sha1_to_link_filesystem_paths
• spec_with_app
• specify_phantomjs_download_location
• speed_up_feature_specs_and_nuke_the_travis_timeout
• split-sufia-js
• sprockets_shmockets
• sr-only
• stats_refactor
• status_monitor
• stdout_logger
• sticky_footer
• style-tweaks
• styling
• sufia-scss-assets
• sul-dropdown
• sul-fix
• suppress_double_title
• system_stats
• take_two
• task-docs
• temporary_fix
• test-fix
• test_cc_1.7
• test_cc_120_and_rails_427
• test_rails_4.2.6
• test_subjects
• test_with_user
• test_work_widget
• tidying-up-rubocop
• tiny_mce
• title_stats
• toggle-details
• toolbar
• track_admin
• transfer_files_link
• transfers_no_gw
• transfers_sign_in
• translate_modified
• translator-class
• trap_missing_admin_set
• trophy-title
• trophy_controller
• trophy_presenter
• tumblr
• tweak_rubocop_rspec_autocorrect_rules
• ui_admin_sets
• unavailable_profile
• unnecessary_set
• unorder-collections
• unused-images
• unused_ivar
• update-audit-log-table
• update-beta-quickstart
• update_administrivia
• update_cc
• update_coffee_rails
• update_contributing_guide
• update_deps
• update_eslint
• update_flot
• update_for_hw070
• update_formatting
• update_jobs
• update_nest
• update_rails
• update_rails_controller_testing
• update_rubocop
• update_select2_rails
• update_template_rc2
• update_visiblity
• updates_for_cc
• updating-contributing-guidelines-2017-01-26-14-59-22
• updating-contributing-guidelines-2017-01-26-15-01-15
• upgrade_cc
• upgrade_curation_concerns
• upload-error
• upload-files
• upload_failure_filter
• upload_files
• upload_files_affix
• upload_files_js-sticky
• upload_files_polyfill
• upload_files_scrollChaser
• upload_files_status
• upload_files_status_panel
• upload_files_stickykit
• upload_form_wait_on_completed_uploads_3048
• upload_log
• upload_new_version
• upload_set_id
• upload_to_collection
• upload_with_collection
• uploaders
• uploads-controller-behavior
• url-namespace
• usage_presenters
• use-refactored-form-inputs
• use_ability_logic
• use_admin_set_default_id_from_behavior
• use_cc_132_or_greater
• use_cc_beta6
• use_config
• use_existing_solr_connection
• use_fedora_420
• use_forms_module_namespace
• use_generic_type
• use_hydra_works_0_16_0
• use_released_upstream_flipflop
• use_solr_instead_of_to_model
• use_strings_instead_of_symbols_for_recipients
• use_updated_af_noid
• use_workflow_branch
• user-profile
• user_key_config
• user_mailbox
• user_partial
• user_profile_presenter
• v6.2.0
• v6.3.0
• v6.4.0
• v6.5.0
• v6.6.0
• v6.6.1
• v6.7.0
• v7.0.0
• v7.0.0.beta1
• v7.0.0.beta2
• v7.0.0.beta3
• v7.0.0.beta4
• v7.0.0.rc1
• v7.0.0.rc2
• v7.1.0
• v7.2.0
• v7.3.0.rc3
• v7.3.1
• validate_all
• validation-job
• version-error
• version-filenames
• visibility_badge2
• visibility_link
• visibility_slide
• visibility_textbox
• what-is-drag
• with_test_server
• without_advanced_search
• without_generic_work
• without_generic_work_views
• without_gw
• without_import
• without_page_header
• without_queue
• without_render_500
• without_resque
• without_stub
• without_stylesheet
• without_sufia_url_helper
• without_tt
• without_upgrade600
• work-builder
• work_edit
• work_edit_test
• work_generator
• work_media_thumbnail
• work_no_thumbnail
• work_processing
• work_relation
• work_relationships_view_call_collection_presenter_to_s
• work_show_fields
• work_show_linked_metadata
• work_show_titles
• work_statistics
• work_type_picker
• work_with_hydra_jetty_by_default_in_6x
• workflow_actor
• workflow_name
• workflow_sidebar_submenu
• works-list-bootlint
• works_shared
• works_should_show_help_text_2080
• works_support_text
• yada_yada
• zotero_gw

Build # 6614

Build Type

push

travis-ci

Committed by jcoyne

Commit Message

Merge Sufia configuration with the CurationConcerns

This reduces confusion over which configuration someone should be using.
Fixes #2139

Run Details

3276 of 3457 relevant lines covered (94.76%)

24.33 hits per line