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

1705678123/bb5d882d/27494022 2749402 #39

Merged
merged 45 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
7b7c5c4
Bump crossbeam-channel from 0.5.8 to 0.5.9
dependabot[bot] Dec 14, 2023
e7c61ff
Support prepare commit hook (#1978)
extrawurst Dec 15, 2023
55d316f
Bump anyhow from 1.0.75 to 1.0.76
dependabot[bot] Dec 21, 2023
99c705e
fix stashing tab empty (closes #1986)
extrawurst Dec 22, 2023
8940c47
Bump crossbeam-channel from 0.5.9 to 0.5.10
dependabot[bot] Dec 25, 2023
d9ccd9e
Bump openssl-sys from 0.9.97 to 0.9.98
dependabot[bot] Dec 25, 2023
32d0a5c
Bump anyhow from 1.0.76 to 1.0.77
dependabot[bot] Dec 27, 2023
307d38c
Bump anyhow from 1.0.77 to 1.0.78
dependabot[bot] Jan 1, 2024
975e881
Bump clap from 4.4.11 to 4.4.14
dependabot[bot] Jan 9, 2024
0beff5c
Bump crossbeam-channel from 0.5.10 to 0.5.11
dependabot[bot] Jan 9, 2024
7d4a5d5
.github
RandyMcMillan Dec 30, 2023
9e7b8e8
deny.toml -> .cargo/deny.toml
RandyMcMillan Dec 30, 2023
8cd9782
Cargo.toml
RandyMcMillan Dec 30, 2023
809510f
GNUmakefile:Makefile:cargo.mk:docker.mk
RandyMcMillan Dec 30, 2023
95a74e8
.cargo/audit.toml
RandyMcMillan Dec 30, 2023
d4b2a2e
.clippy.toml
RandyMcMillan Dec 30, 2023
f9d0dee
.gitmodules
RandyMcMillan Dec 30, 2023
f5d7cd9
legit
RandyMcMillan Dec 30, 2023
02bd5af
Dockerfile
RandyMcMillan Dec 30, 2023
7459630
.github/workflows/gnostr-tui-docker.yml
RandyMcMillan Dec 31, 2023
6eacdb7
.github/workflows/gnostr-tui-docker.yml
RandyMcMillan Dec 31, 2023
5cd1239
.github/workflows/gnostr-tui-docker.yml
RandyMcMillan Dec 31, 2023
1acbd92
.github/workflows/gnostr-tui-docker.yml
RandyMcMillan Dec 31, 2023
03243af
.github/workflows/gnostr-tui-docker.yml
RandyMcMillan Dec 31, 2023
c39caea
.github/workflows/gnostr-tui-docker.yml
RandyMcMillan Dec 31, 2023
875585f
gnostr-tui-docker
RandyMcMillan Dec 31, 2023
117ea07
man/gnostr-tui.1
RandyMcMillan Dec 31, 2023
5e8c0e4
theme.ron
RandyMcMillan Dec 31, 2023
0fa02a9
Cargo.lock
RandyMcMillan Dec 31, 2023
443a258
rust-toolchain.toml
RandyMcMillan Dec 31, 2023
fbf4514
serve
RandyMcMillan Dec 31, 2023
d8d8b74
run
RandyMcMillan Dec 31, 2023
52470b7
.gitignore
RandyMcMillan Dec 31, 2023
50e42d8
src/args.rs
RandyMcMillan Jan 1, 2024
71a1baf
src/tabs/status.rs
RandyMcMillan Jan 1, 2024
2bdb82a
wix/main.wxs
RandyMcMillan Jan 1, 2024
46c6dbe
src/components/help.rs
RandyMcMillan Jan 1, 2024
ea7b225
src/main.rs
RandyMcMillan Jan 1, 2024
767401a
src/options.rs
RandyMcMillan Jan 1, 2024
7dc6f7b
src/ui/style.rs
RandyMcMillan Jan 1, 2024
0aa0613
src/strings.rs
RandyMcMillan Jan 1, 2024
deeb936
asyncgit/src/lib.rs
RandyMcMillan Jan 1, 2024
09012da
Update pre-release.yml
RandyMcMillan Jan 19, 2024
86fdb99
Merge branch 'master' into 1705678123/bb5d882d/27494022-2749402
RandyMcMillan Jan 19, 2024
df52507
.github/workflows/ci.yml
RandyMcMillan Jan 19, 2024
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
2 changes: 1 addition & 1 deletion .cargo/audit.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[advisories]
ignore = []
ignore = [ "RUSTSEC-2022-0092", "RUSTSEC-2022-0011", "RUSTSEC-2022-0004", "RUSTSEC-2020-0071" ]
29 changes: 29 additions & 0 deletions .cargo/deny.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[licenses]
unlicensed = "deny"
allow = [
"MIT",
"Apache-2.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"ISC",
"MPL-2.0"
]
copyleft = "warn"
allow-osi-fsf-free = "neither"
default = "deny"
confidence-threshold = 0.9

[[licenses.exceptions]]
allow = ["Unicode-DFS-2016"]
name = "unicode-ident"
version = "1.0.3"

[bans]
## multiple-versions = "deny"
skip-tree = [
{ name = "windows-sys" }
]

[advisories]
ignore = [ "RUSTSEC-2022-0092", "RUSTSEC-2022-0011", "RUSTSEC-2022-0004", "RUSTSEC-2020-0071","RUSTSEC-2021-0145" ]
4 changes: 2 additions & 2 deletions .clippy.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
msrv = "1.65.0"
cognitive-complexity-threshold = 18
msrv = "1.70.0"
cognitive-complexity-threshold = 18
75 changes: 75 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of
experience,
education, socio-economic status, nationality, personal appearance, race,
religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting


## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at yoshuawuyts@gmail.com, or through
IRC. All complaints will be reviewed and investigated and will result in a
response that is deemed necessary and appropriate to the circumstances. The
project team is obligated to maintain confidentiality with regard to the
reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
available at
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
63 changes: 63 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Contributing
Contributions include code, documentation, answering user questions, running the
project's infrastructure, and advocating for all types of users.

The project welcomes all contributions from anyone willing to work in good faith
with other contributors and the community. No contribution is too small and all
contributions are valued.

This guide explains the process for contributing to the project's GitHub
Repository.

- [Code of Conduct](#code-of-conduct)
- [Bad Actors](#bad-actors)
- [Developer Certificate of Origin](#developer-certificate-of-origin)

## Code of Conduct
The project has a [Code of Conduct][./CODE_OF_CONDUCT.md] that *all*
contributors are expected to follow. This code describes the *minimum* behavior
expectations for all contributors.

As a contributor, how you choose to act and interact towards your
fellow contributors, as well as to the community, will reflect back not only
on yourself but on the project as a whole. The Code of Conduct is designed and
intended, above all else, to help establish a culture within the project that
allows anyone and everyone who wants to contribute to feel safe doing so.

Should any individual act in any way that is considered in violation of the
[Code of Conduct][./CODE_OF_CONDUCT.md], corrective actions will be taken. It is
possible, however, for any individual to *act* in such a manner that is not in
violation of the strict letter of the Code of Conduct guidelines while still
going completely against the spirit of what that Code is intended to accomplish.

Open, diverse, and inclusive communities live and die on the basis of trust.
Contributors can disagree with one another so long as they trust that those
disagreements are in good faith and everyone is working towards a common
goal.

## Bad Actors
All contributors to tacitly agree to abide by both the letter and
spirit of the [Code of Conduct][./CODE_OF_CONDUCT.md]. Failure, or
unwillingness, to do so will result in contributions being respectfully
declined.

A *bad actor* is someone who repeatedly violates the *spirit* of the Code of
Conduct through consistent failure to self-regulate the way in which they
interact with other contributors in the project. In doing so, bad actors
alienate other contributors, discourage collaboration, and generally reflect
poorly on the project as a whole.

Being a bad actor may be intentional or unintentional. Typically, unintentional
bad behavior can be easily corrected by being quick to apologize and correct
course *even if you are not entirely convinced you need to*. Giving other
contributors the benefit of the doubt and having a sincere willingness to admit
that you *might* be wrong is critical for any successful open collaboration.

Don't be a bad actor.

## Developer Certificate of Origin
All contributors must read and agree to the [Developer Certificate of
Origin (DCO)](../CERTIFICATE).

The DCO allows us to accept contributions from people to the project, similarly
to how a license allows us to distribute our code.
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## Summary
Explain what is going on.

## Your Environment
| Software | Version(s) |
| ------------------ | ---------- |
| hypercore-protocol |
| Rustc |
| Operating System |
43 changes: 17 additions & 26 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: 'bug'
assignees: ''

name: Bug Report
about: Did something not work as expected?
---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.
# Bug Report
## Your Environment
| Software | Version(s) |
| ------------------ | ---------- |
| hypercore-protocol |
| Rustc |
| Operating System |

**Screenshots**
If applicable, add screenshots to help explain your problem.
## Expected Behavior
Tell us what should have happened.

**Context (please complete the following information):**
- OS/Distro + Version: [e.g. `macOS 10.15.5`]
- GitUI Version [e.g. `0.5`]
- Rust version: [e.g `1.44`]
## Current Behavior
Tell us what happens instead of the expected behavior. If you are seeing an
error, please include the full error message and stack trace.

**Additional context**
Add any other context about the problem here.
## Code Sample
Please provide a code repository, gist, code snippet or sample files to
reproduce the issue.
51 changes: 37 additions & 14 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,43 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'feature-request'
assignees: ''

name: Feature Request
about: Want us to add something to hypercore-protocol?
---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
# Feature Request
## Summary
One paragraph explanation of the feature.

## Motivation
Why are we doing this? What use cases does it support? What is the expected
outcome?

## Guide-level explanation
Explain the proposal as if it was already included in the project and you
were teaching it to another programmer. That generally means:

- Introducing new named concepts.
- Explaining the feature largely in terms of examples.
- If applicable, provide sample error messages, deprecation warnings, or
migration guidance.

## Reference-level explanation
This is the technical portion of the feature request. Explain the design in
sufficient detail that:

- Its interaction with other features is clear.
- It is reasonably clear how the feature would be implemented.
- Corner cases are dissected by example.

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
## Drawbacks
Why should we _not_ do this?

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
## Rationale and alternatives
- Why is this design the best in the space of possible designs?
- What other designs have been considered and what is the rationale for not
choosing them?
- What is the impact of not doing this?

**Additional context**
Add any other context or screenshots about the feature request here.
## Unresolved Questions
What related issues do you consider out of scope for this feature that could be
addressed in the future independently of the solution that comes out of this
feature?
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: Question
about: Have any questions regarding how hypercore-protocol works?
---

# Question
## Your Environment
| Software | Version(s) |
| ------------------ | ---------- |
| hypercore-protocol |
| Rustc |
| Operating System |

## Question
Provide your question here.

## Context
How has this issue affected you? What are you trying to accomplish?
31 changes: 18 additions & 13 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
<!---
Thank you for contributing to GitUI! Please fill out the template below, and remove or add any
information as you feel neccesary.
--->
<!--
Thanks for creating a Pull Request 😄 ! Before you submit, please read the following:
- Read our CONTRIBUTING.md file before submitting a patch.
- By making a contribution, you agree to our Developer Certificate of Origin.
-->

This Pull Request fixes/closes #{issue_num}.
**Choose one:** is this a 🐛 bug fix, a 🙋 feature, or a 🔦 documentation change?

It changes the following:
-
-
<!-- Provide a general summary of the changes in the title above -->

I followed the checklist:
- [ ] I added unittests
- [ ] I ran `make check` without errors
- [ ] I tested the overall application
- [ ] I added an appropriate item to the changelog
## Checklist
<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
- [ ] tests pass
- [ ] tests and/or benchmarks are included
- [ ] documentation is changed or added

## Context
<!-- Is this related to any GitHub issue(s)? -->

## Semver Changes
<!-- Which semantic version change would you recommend? -->
21 changes: 10 additions & 11 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 180
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
# Configuration for probot-stale - https://github.com/probot/stale

daysUntilStale: 90
daysUntilClose: 7
exemptLabels:
- pinned
- security
- nostale
# Label to use when marking an issue as stale
staleLabel: dormant
# Comment to post when marking an issue as stale. Set to `false` to disable
exemptProjects: false
exemptMilestones: false
staleLabel: wontfix
markComment: >
This issue has been automatically marked as stale because it has not had
any activity half a year. It will be closed in 14 days if no further activity occurs. Thank you
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
unmarkComment: false
closeComment: false
limitPerRun: 30
Loading
Loading