Skip to content

Commit

Permalink
update master to main (#731)
Browse files Browse the repository at this point in the history
  • Loading branch information
jwoertink authored Feb 13, 2022
1 parent 96fd8b9 commit 5649c9e
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ updates:
directory: "/"
schedule:
interval: "daily"
target-branch: master
target-branch: main
reviewers:
- stephendolan

- package-ecosystem: npm
directory: "/src/browser-app-skeleton"
schedule:
interval: daily
target-branch: master
target-branch: main
versioning-strategy: increase
reviewers:
- stephendolan
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Lucky CLI CI

on:
push:
branches: [master]
branches: [main]
pull_request:
branches: "*"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Lucky CLI Weekly CI

on:
push:
branches: [master]
branches: [main]
pull_request:
schedule:
- cron: "0 1 * * MON"
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ already been submitted.
asking for help. We love helping!
* Please don't update the Gem version.

[repo]: https://github.com/luckyframework/lucky_cli/tree/master
[repo]: https://github.com/luckyframework/lucky_cli/
[fork]: https://help.github.com/articles/fork-a-repo/
[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/
[pr]: https://help.github.com/articles/using-pull-requests/
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Run `which lucky` from the command line to make sure it is installed.

## API Documentation

[API (master)](https://luckyframework.github.io/lucky_cli/)
[API (main)](https://luckyframework.github.io/lucky_cli/)

## Contributing

Expand Down
14 changes: 7 additions & 7 deletions shard.edge.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
dependencies:
lucky:
github: luckyframework/lucky
branch: master
branch: main
authentic:
github: luckyframework/authentic
branch: master
branch: main
carbon:
github: luckyframework/carbon
branch: master
branch: main
carbon_sendgrid_adapter:
github: luckyframework/carbon_sendgrid_adapter
branch: master
branch: main
lucky_env:
github: luckyframework/lucky_env
branch: master
branch: main
lucky_task:
github: luckyframework/lucky_task
branch: master
branch: main
jwt:
github: crystal-community/jwt
branch: master

development_dependencies:
lucky_flow:
github: luckyframework/lucky_flow
branch: master
branch: main
2 changes: 1 addition & 1 deletion shard.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
dependencies:
lucky:
github: luckyframework/lucky
branch: master
branch: main
2 changes: 1 addition & 1 deletion spec/integration/deploy_to_heroku_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ require "../spec_helper"
should_run_successfully "heroku addons:create heroku-postgresql:hobby-dev"
should_run_successfully "git add -A"
should_run_successfully "git commit -m 'Init'"
should_run_successfully "git push heroku master"
should_run_successfully "git push heroku main"
wait_to_boot
end
end
Expand Down
2 changes: 1 addition & 1 deletion src/web_app_skeleton/config/server.cr.ecr
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Lucky::Server.configure do |settings|
settings.gzip_enabled = true
# By default certain content types will be gzipped.
# For a full list look in
# https://github.com/luckyframework/lucky/blob/master/src/lucky/server.cr
# https://github.com/luckyframework/lucky/blob/main/src/lucky/server.cr
# To add additional extensions do something like this:
# settings.gzip_content_types << "content/type"
else
Expand Down

0 comments on commit 5649c9e

Please # to comment.