emory-libraries / dlp-lux

91%

master: 92%

LAST BUILD ON BRANCH refactor_views_revamp

branch: refactor_views_revamp

CHANGE BRANCH

x

Reset

• refactor_views_revamp
• about-page
• about_digital_collections_352
• about_this_item_grouping
• add-honeybadger
• add-sample-dotenv
• add_alt_text_collection_hero_images_659
• add_alt_title_to_footer_badge_654
• add_dislaimer_copyright_468
• add_footer
• add_label_any_all_dropdown_658
• add_meta_description_tag_621
• add_purl_find_item_540
• add_titles_to_dls_and_divs_show_page_656
• additional_details
• adjust_display_search_result_items_626
• adjust_footer_height_570
• adjust_line_height_h1_587
• adr-x-fwd-for
• advanced-search
• advanced-search-facets
• advanced-search-fields
• advanced-search-page
• align_search_result_list_top_facet_576
• align_search_tools_578
• align_solr_schema
• alignment_result_titles_573
• authentication_test
• blacklight-performance
• blacklight_advanced_search_gem
• bookmark_rescue
• bookmarks-links
• bootstrap_refactor
• breadcrumb_display_break_556
• breadcrumbs_advanced_history_bookmarks_557
• browse-links
• change_color_breadcrumb_element_652
• change_highlight_color_active_facet_574
• change_text_color_browse_572
• change_text_search_history_627
• circle-screenshots
• circle_ci_tweaks
• clean_up_temp_files
• collate
• collection-page
• collection_add_padding_below_hero_579
• collection_page_redux
• collection_work_titles_left_aligned_584
• collection_work_top_page_spacing_580
• collection_works_dates_separate_lines_583
• collections_facet
• config_rose_ips
• cookie_reboot
• cookies_reset
• correct_unknown_date_citation_589
• corrects_citation_builder_default_citation_method
• corrects_user_authorization_redirect_191
• create_breadcrumb_links_3
• create_breadcrumb_links_3_revised
• create_contact_page_353
• create_copyright_reuse_page_367
• css_experiment
• css_experiment_3
• data-source-notes
• database_auth
• date-facet-fix
• date-slider
• date_facets
• date_sort
• delete_copyright_reuse_page_519
• dependabot/bundler/kaminari-1.2.1
• devise-session
• devise-timeout
• display-child-works
• display_access_restriction_note_628
• display_representative_media_310
• dropdown
• edit_tools_links_500
• emory-low-uv
• emory_logo
• emory_visible_access
• encrypt_cookie
• ensure_proper_404
• explore-collections-fix
• facet_start
• facets
• facets-fix
• facets-styles
• find-item
• find_this_item_refactor
• fix-advanced-search
• fix-child-works
• fix_chevrons
• fix_env_for_deploy
• fix_human_readable_date_issued
• fix_it
• fix_saved_search_deploy
• fonts
• footer
• footer-revision
• google_analytics
• google_analytics_library
• header
• header-bug
• header-fix
• header-width
• header_breaks_back_advanced_search_673
• header_link_styles
• header_link_styling
• header_refactor
• headers_4_eva
• help-text
• hero-image
• hero-image-fix
• hero-images-revision
• hero-interval
• hero_title_mobile_restyling_608
• history-page
• homepage_adjust_mobile_layout_571
• http_password_protection
• human-readable-copyright-conference
• human-readable-data-collection-dates
• human_readable_date
• human_readable_licenses
• iframe-title
• implement_citation_gem_490
• implement_citeproc.gem_490
• initial-footer
• link_child_works_399
• link_rights_statement
• links-to-facets
• local-mysql
• local_icons
• login_prompt
• logo_links
• main
• make_range_end_date_dynamic_554
• master
• match_solr_metadata
• metadata-labels
• metadata_layout
• metadata_layout_fresh
• metadata_layout_fresh_w_headers
• metadata_no_sidebar
• metadata_show_page
• misc_details_partial
• more-info-tab
• more-shib-setup
• move_layout_helper
• mysql
• new_approach_to_views
• openssh_support
• order_facets
• pagination_fix
• placeholder-shields
• publication_metadata
• purls
• random-carousel
• reading-room-flow
• readme-patch
• readme_how_to_deploy
• refactor_views
• relevancy_test_suite
• remove-default-catalog-controller-options
• remove-search-bar
• remove-sort
• remove_cite_link
• remove_format_facet
• remove_sample_data_rake_task_545
• remove_unused_test
• restore-index-fields
• revert-547-remove_cite_link
• revert-local-icons
• revert-thumbnail
• revert_align_search_results_ticket_573
• revisions_to_pr_453
• rose_high
• rose_reading_room_ip_file
• rose_thumbnails
• route_auth_user_requested_page_191
• search-by-id
• search-results
• search_box_styling
• search_does_not_work_390
• search_fields
• search_result_preview
• search_results_metadata
• search_test
• shib-setup
• shib_wording
• show_page_metadata
• smoke2
• smoke3
• smoketest
• sort
• sort-date
• sort-facets
• sort-year
• static_change_h2_size_586
• static_explore_boxes_top_align_585
• style_bookmarks_372
• style_collection_page_369
• style_search_results_368
• style_work_page_370
• targeted-search
• temp_files_again
• test_for_footer
• theme_search_page
• this-item-contains
• this_item_contains
• this_item_is_part_of
• thumbnails_from_env
• thumbnails_in_search_results
• thumbs_from_iiif
• thumbs_log_in_only
• tweaks_shibboleth_redirect_further_191
• universal_viewer_spike
• update-grouping-layout
• update_404
• update_about_page_432
• update_blacklight_advanced_search_gem
• update_contact_page_516
• update_lux_404_550
• update_salts
• update_text_about_566
• update_token_value
• user_friendly_dates
• username
• uv-config
• uv-config-changes
• uv_config_attempt_3
• uv_partials
• uv_rm_buttons
• view-collection-color
• visibility_in_search
• wrap_document_heading_2nd_row_dl_655
• x_forwarded_for
• year_for_lux_facet

Trying to resolve conflict