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.

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

correct references (including master -> main) #25

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ThreddedCreateApp [![Build Status](https://travis-ci.org/thredded/thredded_create_app.svg?branch=master)](https://travis-ci.org/thredded/thredded_create_app) [![Test Coverage](https://codeclimate.com/github/thredded/thredded_create_app/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded_create_app/coverage)
# ThreddedCreateApp [![Build Status](https://travis-ci.org/thredded/thredded_create_app.svg?branch=main)](https://travis-ci.org/thredded/thredded_create_app) [![Test Coverage](https://codeclimate.com/github/thredded/thredded_create_app/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded_create_app/coverage)

Generates a Rails app with the [Thredded](https://github.com/thredded/thredded) forums engine installed.

Expand Down Expand Up @@ -158,9 +158,9 @@ Once you've deployed your app, please let us know that you are using Thredded
by tweeting [@thredded]!

[@thredded]: https://twitter.com/thredded
[Devise Readme]: https://github.com/plataformatec/devise/blob/master/README.md
[Devise Readme]: https://github.com/heartcombo/devise/blob/main/README.md
[Thredded chat room]: https://gitter.im/thredded/thredded
[Thredded Readme]: https://github.com/thredded/thredded/blob/master/README.md
[Thredded Readme]: https://github.com/thredded/thredded/blob/main/README.md

## Deploying to Heroku

Expand All @@ -173,7 +173,7 @@ heroku create
heroku config:set RACK_ENV=production RAILS_ENV=production \
SECRET_KEY_BASE="$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
# Deploy to heroku
git push heroku master
git push heroku main
# Set up the database and some seed data (an admin user and a messageboard)
heroku run rake db:migrate db:seed
# Open the website in your default browser
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// See https://www.google.com/design/spec/style/color.html#color-color-palette
// https://github.com/angular/material2/blob/master/src/lib/core/theming/_palette.scss
// https://github.com/angular/components/blob/main/src/material/core/theming/_palette.scss
@at-root {
$black-87-opacity: rgba(black, 0.87);
$white-87-opacity: rgba(white, 0.87);
Expand Down