Skip to content

Commit 7c0fc8d

Browse files
authored
Merge pull request #53 from AlphaOne1/fix_govulncheck_job
Fix typos, improve grammatical consistency, and update templates.
2 parents e5aeaa0 + 6f158c1 commit 7c0fc8d

4 files changed

Lines changed: 14 additions & 13 deletions

File tree

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ A clear and concise description of what the bug is.
1818
Steps to reproduce the behavior:
1919

2020
1. Go to '...'
21-
2. Click on '....'
22-
3. Scroll down to '....'
21+
2. Click on '...'
22+
3. Scroll down to '...'
2323
4. See error
2424

2525
**Expected behavior**

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You can erase any parts of this template not applicable to your Pull Request.
1717

1818
1. [ ] Did you add tests for the new features that cover all major code paths?
1919
2. [ ] Does your submission pass tests?
20-
3. [ ] Have you lint your code locally before submission?
20+
3. [ ] Have you linted your code locally before submission?
2121

2222
**What is the new behavior (if this is a feature change)?**
2323

.github/workflows/security.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ jobs:
6666
- name: PrintSarif
6767
run: |
6868
cat govulncheck-results.sarif
69-
if [ grep results govulncheck-results.serif ]
69+
70+
if grep "'results'" govulncheck-results.serif
7071
then
7172
echo "hasResults=true" >> $GITHUB_OUTPUT
7273
else

CODE_OF_CONDUCT.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ geany Community Code of Conduct
77

88
Like the technical community as a whole, the *geany* team and community is
99
made up of a mixture of professionals and volunteers from all over the world,
10-
working on every aspect of the mission - including mentorship, teaching and
10+
working on every aspect of the missionincluding mentorship, teaching and
1111
connecting people.
1212

1313
Diversity is one of our huge strengths, but it can also lead to communication
1414
issues and unhappiness. To that end, we have a few ground rules that we ask
1515
people to adhere to when they're participating within this community and
16-
project. These rules apply equally to founders, mentors and those seeking help
16+
project. These rules apply equally to founders, mentors, and those seeking help
1717
and guidance.
1818

1919
This isn't an exhaustive list of things that you can't do. Rather, take it in
20-
the spirit in which it's intended - a guide to make it easier to enrich all of
20+
the spirit in which it's intendeda guide to make it easier to enrich all of
2121
us, the technical community and the conferences and user groups we hope to guide
2222
new speakers to.
2323

@@ -28,14 +28,14 @@ mailing list, and other forums such as Skype, Google+ Hangouts, etc.
2828

2929
* __Be considerate.__ Your work will be used by other people, and you in turn
3030
will depend on the work of others. Any decision you make will affect users and
31-
colleagues, and you should take those consequences into account when making
31+
colleagues, and you should take into account those consequences when making
3232
decisions.
3333

3434
* __Be respectful.__ Not all of us will agree all the time, but disagreement is
35-
no excuse for poor behaviour and poor manners. We might all experience some
35+
no excuse for poor behavior and poor manners. We might all experience some
3636
frustration now and then, but we cannot allow that frustration to turn into a
3737
personal attack. It's important to remember that a community where people feel
38-
uncomfortable or threatened is not a productive one. Members of the *geany*
38+
uncomfortable or threatened is not productive. Members of the *geany*
3939
community should be respectful when dealing with other members as well as with
4040
people outside the *geany* community and with user groups/conferences,
4141
user group/conference organizers.
@@ -52,9 +52,9 @@ that we resolve disagreements and differing views constructively. Remember that
5252
we're different. The strength of *geany* comes from its varied community,
5353
people from a wide range of backgrounds. Different people have different
5454
perspectives on issues. Being unable to understand why someone holds a viewpoint
55-
doesn't mean that they're wrong. Don't forget that it is human to err and
56-
blaming each other doesn't get us anywhere, rather offer to help resolving
57-
issues and to help learn from mistakes.
55+
doesn't mean that they're wrong. Don't forget that it is human to make errors,
56+
and blaming each other doesn't get us anywhere. Rather, offer to help resolve
57+
issues and learn from mistakes.
5858

5959
*Original text courtesy of the
6060
[Speak Up! project](http://web.archive.org/web/20141109123859/http://speakup.io/coc.html).*

0 commit comments

Comments
 (0)