ucsdlib / damspas

66%

master: 66%

LAST BUILD ON BRANCH feature/SHARE2_metadata

branch: feature/SHARE2_metadata

CHANGE BRANCH

x

Reset

• feature/SHARE2_metadata
• ${bamboo.planRepository.0.branchName}
• add-new-relic-staging
• ansible
• beeline-update
• circle-and-docker
• circleci-20-test
• circleci-fixcache
• collection-spellcheck-issue
• default_sort
• dependabot/bundler/capistrano-3.12.0
• dependabot/bundler/capistrano-rails-1.3.1
• dependabot/bundler/capybara-2.18.0
• dependabot/bundler/coffee-rails-4.2.2
• dependabot/bundler/devise-4.4.3
• dependabot/bundler/devise-4.6.1
• dependabot/bundler/ffi-1.10.0
• dependabot/bundler/ffi-1.11.1
• dependabot/bundler/json-2.3.0
• dependabot/bundler/lograge-0.11.0
• dependabot/bundler/lograge-0.9.0
• dependabot/bundler/loofah-2.2.2
• dependabot/bundler/loofah-2.3.1
• dependabot/bundler/minitest-5.11.3
• dependabot/bundler/newrelic_rpm-4.8.0.341
• dependabot/bundler/nokogiri-1.10.1
• dependabot/bundler/nokogiri-1.10.3
• dependabot/bundler/nokogiri-1.10.5
• dependabot/bundler/nokogiri-1.10.8
• dependabot/bundler/nokogiri-1.8.2
• dependabot/bundler/omniauth-1.8.1
• dependabot/bundler/omniauth-1.9.1
• dependabot/bundler/omniauth-shibboleth-1.3.0
• dependabot/bundler/qa-1.2.0
• dependabot/bundler/rack-1.6.12
• dependabot/bundler/rack-1.6.13
• dependabot/bundler/rack-dev-mark-0.7.7
• dependabot/bundler/rack-dev-mark-0.7.8
• dependabot/bundler/rails-4.2.10
• dependabot/bundler/rails-html-sanitizer-1.0.4
• dependabot/bundler/rake-12.3.1
• dependabot/bundler/rake-12.3.3
• dependabot/bundler/rspec-rails-3.6.1
• dependabot/bundler/rspec_junit_formatter-0.3.0
• dependabot/bundler/rubocop-0.54.0
• dependabot/bundler/rubocop-rspec-1.16.0
• dependabot/bundler/rubocop-rspec-1.30.0
• dependabot/bundler/sass-rails-5.0.7
• dependabot/bundler/selenium-webdriver-3.11.0
• dependabot/bundler/selenium-webdriver-3.142.7
• dependabot/bundler/sitemap_generator-6.0.1
• dependabot/bundler/sitemap_generator-6.0.2
• dependabot/bundler/sprockets-3.7.1
• dependabot/bundler/uglifier-4.1.8
• dependabot/bundler/uglifier-4.2.0
• dependabot/bundler/unicorn-5.4.0
• dependabot/bundler/unicorn-5.5.3
• develop
• disable-hound
• docker-composes-with-solr
• docker-db-schema
• dockerize
• downgrade-ruby
• feature/411_items_view
• feature/415_complex_obj
• feature/SHARE-V2_Updates
• feature/SHARE2_mapping
• feature/SHAREV2_mapping
• feature/SHARE_V2_updates
• feature/access_label
• feature/add-bcc
• feature/add-embed-ui
• feature/add_rubyzip
• feature/alt_text
• feature/alt_txt
• feature/audio_image_embed
• feature/audio_player_update
• feature/browse_collection_metadataonly
• feature/browse_topic_nav_menu
• feature/clr_edit
• feature/code_review_tools
• feature/collection_items
• feature/collection_link
• feature/collectiton_items_view
• feature/complex_obj_metadata
• feature/copyright
• feature/cultural_obj_thumbnail
• feature/cultural_restricted_obj
• feature/delete_repos_display
• feature/deploy_config
• feature/elements-re-ordering
• feature/file_download
• feature/file_downloading
• feature/fix_dup_note
• feature/fix_embargo_view
• feature/fix_go_feature
• feature/fix_mixed_coll_search
• feature/fix_nav_bar
• feature/fulltext-complex-html
• feature/gems_update
• feature/gems_upgrade
• feature/help-data-deposit
• feature/html_tags
• feature/https
• feature/htts_links
• feature/image_embed
• feature/img_title
• feature/jwplayer8
• feature/license_display
• feature/local_display_metadata
• feature/log-rest-client
• feature/metadata-only
• feature/metadata-only-collectiion
• feature/metadata_only_object
• feature/mixed_collection
• feature/mixed_obj_coll
• feature/more-role-order
• feature/nokogili_upgrade
• feature/nokogiri
• feature/objects_count
• feature/omniauth
• feature/rdcp-collection-sort
• feature/rdcp-sorting
• feature/remove-download
• feature/remove_secure_token
• feature/restart-damsolrizer
• feature/restricted_object_view
• feature/revert_boilerplate
• feature/revert_wowzaurl
• feature/secureToken
• feature/share_delete
• feature/sign-in-link
• feature/sitemap-production-only
• feature/sitetrackings
• feature/solr-title-searching
• feature/sort-fields
• feature/streaming_ucsd_guest
• feature/subscriptsTitle
• feature/support-docker-debugging
• feature/test2
• feature/test_connection_stream
• feature/update_doi
• feature/update_ruby_version
• feature/update_share
• feature/upgradeGems
• feature/upgrade_gem
• feature/video_icon_download
• feature/vrr
• fix-logger
• fix-qa-solrizer-2
• fix-qa-solrizer-3
• gh-template-no-fixes
• honeycomb-key-refactor
• https-email
• i-didnt-mean
• master
• new-relic-prod-only
• normalize-dl-buttons
• phantomjs-to-chrome
• pry-byebug
• relationships-patch
• release/1.69
• release/1.7.0
• release/1.71
• release/1.72
• release/1.73
• release/1.74
• release/1.75
• release/1.76
• release/1.77
• release/1.78
• release/1.79
• release/1.80
• remove-database-dev-stuff
• revert-rdcp-sort
• ruby-circle-ci-sync
• send-file
• sort-names
• template-updates
• testBuild
• update-dependencies
• use-alpine-for-damspas
• use-deploy-group-cap
• vrr-cron-times
• vrr-docs
• vrr-fix-revoke
• vrr-fix-revoke-id
• vrr_download
• vrr_downloads

Fixing the merging conflicts