Skip to content

Commit 174a5d8

Browse files
author
Aaron Suarez
committed
Change master -> main for inclusivity
1 parent 813fccb commit 174a5d8

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ workflows:
2424
filters:
2525
branches:
2626
only:
27-
- master
27+
- main
2828

2929
jobs:
3030
build_test:

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ technology/tool. It's a very nice way to ramp up quickly with specific tooling.
121121
- Once you have finished working on your issue, push your changes to your own
122122
github repo, and then submit a pull request.
123123

124-
- To return to your main `master` branch, type the following command in your
124+
- To return to your `main` branch, type the following command in your
125125
terminal.
126126

127127
```bash
128-
git checkout master
128+
git checkout main
129129
```
130130

131131
</details>

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ This project began when I ([Aaron Suarez](https://github.com/aaron-suarez)) star
130130
131131
Immediately, I received several requests from others asking for this list. I started to share it around via DMs, and someone suggested that I put it up on GitHub. I also got a lot of feedback about how it would be nice if there was more metadata, like a way to categorize the resources, organize them by language, and maybe even have some notes or a description (assuming the title isn't obvious). Meanwhile, the list continued to grow rapidly.
132132
133-
Someone got the bright idea to put it on the OC website, so I started working on a PR to incorporate it into OC, which at the time used Rails and YAML files to serve up list-like content. However, a redesign of the site was in progress, so my PR was never merged. Eventually I got out of the military and began doing software development full time. I kept maintaining the list as a little side project and sharing it around, but it hasn't made it onto the OC website. However, the [resources.yml](https://github.com/OperationCode/resources_api/blob/master/resources.yml) file is accessible via Slack with a slash command, so if you type `/repeat resources` in a public channel, the bot will link you to that file.
133+
Someone got the bright idea to put it on the OC website, so I started working on a PR to incorporate it into OC, which at the time used Rails and YAML files to serve up list-like content. However, a redesign of the site was in progress, so my PR was never merged. Eventually I got out of the military and began doing software development full time. I kept maintaining the list as a little side project and sharing it around, but it hasn't made it onto the OC website. However, the [resources.yml](https://github.com/OperationCode/resources_api/blob/main/resources.yml) file is accessible via Slack with a slash command, so if you type `/repeat resources` in a public channel, the bot will link you to that file.
134134
135135
Eventually, the idea to use the data for multiple purposes was proposed. One really cool idea was for a Slack bot to ping relevant channels with random resources on a regular basis so that people could find awesome resources that had been shared without having to find them by searching the slack history. So it was decided that a full featured API would be important in order to really serve the needs of the OC community. This repo contains the source for the aforementioned API.
136136

app.ini

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ module = run
1515
; This is the name of the variable
1616
; in our script that will be called
1717
callable = app_dispatch
18+
19+
; this problematic verbiage is necessary for uWSGI...
20+
; perhaps one day they'll have a more inclusive name for this setting
1821
master = true
1922
; Set uWSGI to start up 2 workers
2023
processes = 2

0 commit comments

Comments
 (0)