Skip to content

Commit

Permalink
Merge pull request #33 from Islandora/master-main-rename
Browse files Browse the repository at this point in the history
Master -> Main Rename
  • Loading branch information
rosiel authored Dec 7, 2020
2 parents 228e932 + 9c51158 commit 4e07902
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
branches:
only:
- /^8.x/
- /master/
- /main/

before_install:
- export SCRIPT_DIR=$HOME/islandora_ci
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ If you would like to submit a use case to the Islandora 8 project, please submit

### Documentation

You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora/documentation/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora/documentation/blob/master/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/master/docs).
You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora/documentation/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora/documentation/blob/main/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/main/docs).

### Request a new feature

Expand Down Expand Up @@ -58,9 +58,9 @@ Contributions to the Islandora codebase should be sent as GitHub pull requests.

Take a look at [Creating a pull request](https://help.github.com/articles/creating-a-pull-request). In a nutshell you need to:

1. [Fork](https://help.github.com/articles/fork-a-repo) this repository to your personal or institutional GitHub account (depending on the CLA you are working under). Be cautious of which branches you work from though (you'll want to base your work off master, or for Drupal modules use the most recent version branch). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions.
1. [Fork](https://help.github.com/articles/fork-a-repo) this repository to your personal or institutional GitHub account (depending on the CLA you are working under). Be cautious of which branches you work from though (you'll want to base your work off main, or for Drupal modules use the most recent version branch). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions.
2. Commit any changes to your fork.
3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora/documentation/blob/master/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora/documentation/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from.
3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora/documentation/blob/main/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora/documentation/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from.

You may want to read [Syncing a fork](https://help.github.com/articles/syncing-a-fork) for instructions on how to keep your fork up to date with the latest changes of the upstream (official) repository.

Expand Down
2 changes: 1 addition & 1 deletion config/install/views.view.iiif_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ display:
default:
display_plugin: default
id: default
display_title: Master
display_title: Main
position: 0
display_options:
access:
Expand Down
2 changes: 1 addition & 1 deletion config/install/views.view.members.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ display:
default:
display_plugin: default
id: default
display_title: Master
display_title: Main
position: 0
display_options:
access:
Expand Down
2 changes: 1 addition & 1 deletion config/install/views.view.openseadragon_media_evas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ display:
default:
display_plugin: default
id: default
display_title: Master
display_title: Main
position: 0
display_options:
access:
Expand Down
2 changes: 1 addition & 1 deletion config/install/views.view.pdfjs_media_evas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ display:
default:
display_plugin: default
id: default
display_title: Master
display_title: Main
position: 0
display_options:
access:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ display:
default:
display_plugin: default
id: default
display_title: Master
display_title: Main
position: 0
display_options:
access:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ display:
default:
display_plugin: default
id: default
display_title: Master
display_title: Main
position: 0
display_options:
access:
Expand Down

0 comments on commit 4e07902

Please sign in to comment.