Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare to change default branch from "master" to "main" #2096

Merged
merged 1 commit into from
Feb 25, 2021
Merged

Prepare to change default branch from "master" to "main" #2096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Emory Theses and Dissertations (ETDs).
or cherokee rose is the <a href="https://georgia.gov/georgia-facts-and-symbols">state flower of Georgia</a>.
<br/><br/>

[![CircleCI](https://circleci.com/gh/curationexperts/laevigata/tree/master.svg?style=svg)](https://circleci.com/gh/curationexperts/laevigata/tree/master)
[![Coverage Status](https://coveralls.io/repos/github/curationexperts/laevigata/badge.svg?branch=master)](https://coveralls.io/github/curationexperts/laevigata?branch=master)
[![Inline docs](http://inch-ci.org/github/curationexperts/laevigata.svg?branch=master)](http://inch-ci.org/github/curationexperts/laevigata)
[![CircleCI](https://circleci.com/gh/curationexperts/laevigata/tree/main.svg?style=svg)](https://circleci.com/gh/curationexperts/laevigata/tree/main)
[![Coverage Status](https://coveralls.io/repos/github/curationexperts/laevigata/badge.svg?branch=main)](https://coveralls.io/github/curationexperts/laevigata?branch=main)
[![Inline docs](http://inch-ci.org/github/curationexperts/laevigata.svg?branch=main)](http://inch-ci.org/github/curationexperts/laevigata)

</td></tr>
</table>
Expand Down Expand Up @@ -108,5 +108,3 @@ To send a copy of all notification expiration emails to a staff member, add that
person's uid to an environment variable called EMBARGO_NOTIFICATION_CC in the
.env.production file on the production server (other servers are configured not to
send email).


4 changes: 2 additions & 2 deletions config/deploy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

SSHKit.config.command_map[:rake] = 'bundle exec rake'

# Default branch is :master
set :branch, ENV['REVISION'] || ENV['BRANCH_NAME'] || ENV['BRANCH'] || 'master'
# Default branch is :main
set :branch, ENV['REVISION'] || ENV['BRANCH_NAME'] || ENV['BRANCH'] || 'main'

append :linked_dirs, "config/emory"
append :linked_dirs, "public/assets"
Expand Down