NYULibraries / ichabod

99%

development: 99%

LAST BUILD ON BRANCH ai-accw

branch: ai-accw

CHANGE BRANCH

x

Reset

• ai-accw
• add_jetty_server_var
• bug/113552525_rake-ichabod-load-fda-ngo-fails-if-specifying-rows-parameter
• bug/fix_nyupress_delete_task
• bug/fix_url_woj
• bug/jetty_deploy
• bug/rails-upgrade-for-CVE-2014-3514
• bug/replace-require
• bug/reset_test_environment
• bug/stabilize-test-data
• bugfix/113552525_rake-ichabod-load-fda-ngo-fails-if-specifying-rows-paramter
• bugfix/commentout_rspec
• bugfix_commentout_rspec
• chore/113569497_full-display-runs-off-yaml
• chore/113569497_make-full-display-run-off-yaml
• chore/113569497_metadata-fields-spec-and-fixture-udpates
• chore/113569497_specs-for-new-metadata_fields-helpers
• chore/113569497_update-nyucore-yaml-file-display-in-order
• chore/113569497_update-nyucore-yaml-file-without-updating-catalog-controller
• chore/113569497_update-nyucore-yaml-file-without-updating-catalog-controller-dev-rebase
• chore/about_page
• chore/add-cassette-to-search-feature
• chore/add-nyucore-tasks
• chore/add-production-fedora-info
• chore/add-user-story-contribution-questions
• chore/add_rake_rosie_delete
• chore/added_cucumber_version
• chore/breadcrumb
• chore/change_reader_asian_ngo
• chore/change_readme
• chore/change_sdr_source
• chore/change_value_book
• chore/collection_authorization
• chore/collection_modification
• chore/debug-production-deploy
• chore/dependencies
• chore/describe-chore-branches
• chore/disable-archive-it-accw
• chore/disable-the-masses
• chore/fix-cukes
• chore/fix-group-in-scenario
• chore/fix-typo-in-CONTRIBUTING.md
• chore/fix_indian_ocean
• chore/fix_json
• chore/fix_sdr_deploy_var
• chore/fixed_collection_facet
• chore/generic_json_loader
• chore/hotfix-master-update-nokogiri
• chore/hotfix-nokogiri-update
• chore/ingest-with-rails-env
• chore/investigate-facet-failure
• chore/make-travis-work
• chore/metadata_fields
• chore/nyucore_fields
• chore/nyucore_markdown
• chore/remove-cassetes
• chore/remove-extraneous-file
• chore/retool_gis_dataset_workflow
• chore/retool_resource_delete_code
• chore/test-if-gitgeoblacklightreader-making-live-calls
• chore/test-merge
• chore/test_delpoy
• chore/timeouts-1
• chore/timeouts-1000
• chore/timeouts-500
• chore/timeouts-60
• chore/timeouts-60-mix
• chore/tweak-deploy-for-production
• chore/update-contributing
• chore/update-deploy
• chore/update-gemfile
• chore/update-gems
• chore/update-gitignore-with-intellij-rules
• chore/update-nokogiri
• chore/update-pds-url
• chore/update-rails
• chore/update-rails-CVE-2104-7829
• chore/update-rails-for-CVE-2016-2098
• chore/update-travis-ruby-versions
• chore/update-travis-to-use-containers
• chore/update-uglifier
• chore/update_contributing
• chore/update_pds_url
• chore/update_pds_url_tests
• chore/update_travis_email
• chore/vcr-for-the-masses
• cucumber_cleanup
• development
• feature/106210416_creator-info-for-nyupress-oa-books
• feature/113551301_update-readme-with-current-data-load-examples
• feature/access_restricted_md
• feature/action_buttons
• feature/add-fda-examples
• feature/add_access_restriction_field
• feature/add_collection_resource_sets
• feature/add_isbn
• feature/add_wojnarowicz
• feature/adding_usage_info_urls
• feature/asian_ngo_dataloader
• feature/authlogic_tests
• feature/authlogic_tests_lamdafied
• feature/collection
• feature/collection_facet
• feature/collection_login_integration
• feature/collection_new
• feature/configula-ssh
• feature/create-afc-group
• feature/create_collection
• feature/create_collections
• feature/create_gis_cataloger_role
• feature/csv_file_dataloader
• feature/dataset_by_title
• feature/download_link
• feature/edit_button_on_results
• feature/edit_metadata_authorization
• feature/exlibris-nyu
• feature/fix-deploy-data-loader-tasks
• feature/fix-nyucore-in-resource-set-resources
• feature/fix-rosie-load-task
• feature/fix-sdr-and-fda-deploy-tasks
• feature/formaggio
• feature/freedom_137303025
• feature/geospatial_data_search_tweaked
• feature/immutable_md_take2
• feature/immutable_source
• feature/immutable_source_md
• feature/immutable_source_take2
• feature/inbrowser
• feature/ingest_voices
• feature/io
• feature/io_new
• feature/iso_language_code_map
• feature/jv_fda_rest_reader
• feature/jv_fda_rest_reader_da70-debug
• feature/jv_fda_rest_reader_new
• feature/jv_fda_rest_reader_test-if-gitgeoblacklightreader-making-live-calls
• feature/liberator_120388273
• feature/libguides-resource-set
• feature/load-fda-ngo
• feature/login-integration
• feature/login-integration-compatible
• feature/masses_data_loader
• feature/masses_fix
• feature/metadata_remediation_tests
• feature/multi_metadata_cukes
• feature/multiple_metadata_cukes_with_fixes
• feature/multiple_metadata_streams
• feature/ngo_fixes
• feature/nyucore_fields
• feature/nyupress_data_loader
• feature/oai_provider
• feature/production-deploy
• feature/production-solr
• feature/research_guide_facet
• feature/resource-set
• feature/resource_set_before_loads
• feature/rethinking_permissions
• feature/rosie-metadata-mappings
• feature/rosie-the-riveter
• feature/rosie-the-riveter-collection
• feature/rspec
• feature/startup_and_shutdown_scripts
• feature/test-users
• feature/thumbnail_image
• feature/update-readme-with-current-data-load-examples
• feature/update_md_outside_ich
• feature/update_readme
• feature/webmock_vcr_config
• features/display_url_brief_results
• features/index_publisher
• geospatial_data_search
• ichabod-23_test-if-reducing-number-of-ruby-versions-speeds-up-tests
• masses_reader
• master
• production_20140905214132
• production_20140908170824
• production_20140908171904
• production_20150610162315
• production_20150722112511
• production_20150729025605
• production_20150729175305
• production_20150805043820
• production_20150812160845
• production_20150813160817
• production_20150831192525
• production_20150909145602
• production_20150930041240
• production_20151118040302
• production_20151130172319
• production_20151216052557
• production_20160113145919
• production_20160126045508
• production_20160129203126
• production_20160217034651
• production_20160226144641
• production_20160301154315
• production_20160316154754
• production_20160317192527
• production_20160504110011
• production_20160518140832
• production_20160630181442
• production_20160714175018
• production_20160923163735
• production_20160926215440
• production_20161012231530
• production_20161019032642
• production_20161023222744
• production_20161122045837
• test_revert
• tweak-fg-lint
• update-database-config
• update-poltergeist-gem-for-phantomjs-2.0.0-support
• update-travis-ruby-versions

Merge branch 'ai-accw' of github.com:NYULibraries/ichabod into ai-accw

Conflicts:
	spec/models/nyucore/collections_spec.rb