From 928e885aa645aeef7eea8bef76ce97d3ac3b8e7e Mon Sep 17 00:00:00 2001 From: "Michael J. Giarlo" Date: Fri, 8 Jan 2021 12:15:04 -0800 Subject: [PATCH] Update master branch references to main branch references --- README.md | 10 +++++----- app/controllers/objects_controller.rb | 2 +- app/services/cocina/from_fedora/access.rb | 2 +- app/services/cocina/to_fedora/access.rb | 2 +- app/services/cocina/to_fedora/resource_type.rb | 2 +- app/services/release_tags.rb | 2 +- app/services/workspace_service.rb | 2 +- config/deploy.rb | 2 +- docs/index.html | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 08580dcb5..7e3887545 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Test Coverage](https://api.codeclimate.com/v1/badges/955223f2386ae5f10e33/test_coverage)](https://codeclimate.com/github/sul-dlss/dor-services-app/test_coverage) [![GitHub version](https://badge.fury.io/gh/sul-dlss%2Fdor-services-app.svg)](https://badge.fury.io/gh/sul-dlss%2Fdor-services-app) [![Docker image](https://images.microbadger.com/badges/image/suldlss/dor-services-app.svg)](https://microbadger.com/images/suldlss/dor-services-app "Get your own image badge on microbadger.com") -[![OpenAPI Validator](http://validator.swagger.io/validator?url=https://raw.githubusercontent.com/sul-dlss/dor-services-app/master/openapi.yml)](http://validator.swagger.io/validator/debug?url=https://raw.githubusercontent.com/sul-dlss/dor-services-app/master/openapi.yml) +[![OpenAPI Validator](http://validator.swagger.io/validator?url=https://raw.githubusercontent.com/sul-dlss/dor-services-app/main/openapi.yml)](http://validator.swagger.io/validator/debug?url=https://raw.githubusercontent.com/sul-dlss/dor-services-app/main/openapi.yml) # DOR Services App @@ -28,7 +28,7 @@ It's possible to clear out and re-seed the staging environment by using the foll ./bin/rake delete_all_objects ``` -This will load all the FOXML from https://github.com/sul-dlss/dor-services-app/blob/master/lib/tasks/seeds/ +This will load all the FOXML from https://github.com/sul-dlss/dor-services-app/blob/main/lib/tasks/seeds/ ## Developer Notes @@ -222,7 +222,7 @@ $ bin/validate-cocina-roundtrip -h Usage: bin/validate-cocina-roundtrip [options] -s, --sample SAMPLE Sample size, otherwise all druids. -r, --random Select random druids. - -f, --fast Do not write results files. + -f, --fast Do not write results files. -d, --druids DRUIDS List of druids (instead of druids.txt). -h, --help Displays help. @@ -272,10 +272,10 @@ $ echo $FEDORA_CACHE /opt/app/deploy/dor-services-app/cache ``` -Test with `bin/validate-cocina-roundtrip`, comparing results from master against your branch. The sample size to you is up to you; bigger samples are recommended for more complex changes. +Test with `bin/validate-cocina-roundtrip`, comparing results from main against your branch. The sample size to you is up to you; bigger samples are recommended for more complex changes. ``` -$ git checkout master +$ git checkout main $ git pull $ bin/validate-cocina-roundtrip -s 350000 -f $ git checkout YOUR_BRANCH_NAME diff --git a/app/controllers/objects_controller.rb b/app/controllers/objects_controller.rb index beed8bfd0..0bc9e6bc4 100644 --- a/app/controllers/objects_controller.rb +++ b/app/controllers/objects_controller.rb @@ -120,7 +120,7 @@ def update_marc_record end # This endpoint is called by the goobi-notify process in the goobiWF - # (code in https://github.com/sul-dlss/common-accessioning/blob/master/lib/robots/dor_repo/goobi/goobi_notify.rb) + # (code in https://github.com/sul-dlss/common-accessioning/blob/main/lib/robots/dor_repo/goobi/goobi_notify.rb) # This proxies a request to the Goobi server and proxies it's response to the client. def notify_goobi response = Dor::Goobi.new(@item).register diff --git a/app/services/cocina/from_fedora/access.rb b/app/services/cocina/from_fedora/access.rb index 63c9c1777..213ed3b97 100644 --- a/app/services/cocina/from_fedora/access.rb +++ b/app/services/cocina/from_fedora/access.rb @@ -50,7 +50,7 @@ def location # Map values from dor-services # https://github.com/sul-dlss/dor-services/blob/b9b4768eac560ef99b4a8d03475ea31fe4ae2367/lib/dor/datastreams/rights_metadata_ds.rb#L221-L228 - # to https://github.com/sul-dlss/cocina-models/blob/master/docs/maps/DRO.json#L102 + # to https://github.com/sul-dlss/cocina-models/blob/main/docs/maps/DRO.json#L102 def access_rights @access_rights ||= if world? diff --git a/app/services/cocina/to_fedora/access.rb b/app/services/cocina/to_fedora/access.rb index 701f9ee41..a41bd6ef7 100644 --- a/app/services/cocina/to_fedora/access.rb +++ b/app/services/cocina/to_fedora/access.rb @@ -19,7 +19,7 @@ def initialize(item, access) end def apply - # See https://github.com/sul-dlss/dor-services/blob/master/lib/dor/datastreams/rights_metadata_ds.rb + # See https://github.com/sul-dlss/dor-services/blob/main/lib/dor/datastreams/rights_metadata_ds.rb Dor::RightsMetadataDS.upd_rights_xml_for_rights_type(item.rightsMetadata.ng_xml, rights_type) item.rightsMetadata.ng_xml_will_change! end diff --git a/app/services/cocina/to_fedora/resource_type.rb b/app/services/cocina/to_fedora/resource_type.rb index 41ce39691..cab4b02e9 100644 --- a/app/services/cocina/to_fedora/resource_type.rb +++ b/app/services/cocina/to_fedora/resource_type.rb @@ -50,7 +50,7 @@ def for_media end # This logic has been excerpted from - # https://github.com/sul-dlss/gis-robot-suite/blob/master/robots/gisAssembly/generate-content-metadata.rb#L30 + # https://github.com/sul-dlss/gis-robot-suite/blob/main/robots/gisAssembly/generate-content-metadata.rb#L30 def for_geo files = file_set.structural.contains case ::File.extname(files.first.filename) diff --git a/app/services/release_tags.rb b/app/services/release_tags.rb index e5c94a1c6..5c5ab843b 100644 --- a/app/services/release_tags.rb +++ b/app/services/release_tags.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# Shows and creates release tags. This replaces parts of https://github.com/sul-dlss/dor-services/blob/master/lib/dor/models/concerns/releaseable.rb +# Shows and creates release tags. This replaces parts of https://github.com/sul-dlss/dor-services/blob/main/lib/dor/models/concerns/releaseable.rb class ReleaseTags # Retrieve the release tags for an item and all the collections that it is a part of # diff --git a/app/services/workspace_service.rb b/app/services/workspace_service.rb index 6ca6bb12f..14b869c53 100644 --- a/app/services/workspace_service.rb +++ b/app/services/workspace_service.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# Creates workspaces. This replaces https://github.com/sul-dlss/dor-services/blob/master/lib/dor/models/concerns/assembleable.rb +# Creates workspaces. This replaces https://github.com/sul-dlss/dor-services/blob/main/lib/dor/models/concerns/assembleable.rb class WorkspaceService # @param [Dor::Item] work the work to create the workspace for # @param [String, nil] source the path to create diff --git a/config/deploy.rb b/config/deploy.rb index 373c4c185..37f72de72 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -3,7 +3,7 @@ set :application, 'dor_services' set :repo_url, 'https://github.com/sul-dlss/dor-services-app.git' -# Default branch is :master +# Default branch is :main ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp } # Default deploy_to directory is /var/www/my_app diff --git a/docs/index.html b/docs/index.html index f67c295be..3b0bbd08c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -14,7 +14,7 @@ - +