Skip to content

Commit c08c702

Browse files
authored
Merge branch 'master' into fix_config_set_when_no_git_dir
2 parents 5b12f82 + a1202eb commit c08c702

File tree

337 files changed

+2700
-510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

337 files changed

+2700
-510
lines changed

.github/stale.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1+
# Probot: Stale
2+
# https://github.com/probot/stale
3+
14
# Number of days of inactivity before an issue becomes stale
25
daysUntilStale: 60
36

47
# Number of days of inactivity before a stale issue is closed
5-
daysUntilClose: 7
8+
# Set to false to disable. If disabled, issues still need to be closed
9+
# manually, but will remain marked as stale.
10+
daysUntilClose: false
611

712
# Issues with these labels will never be considered stale
813
exemptLabels:
914
- pinned
1015
- security
1116

1217
# Label to use when marking an issue as stale
13-
staleLabel: wontfix
18+
staleLabel: stale
1419

1520
# Comment to post when marking an issue as stale. Set to `false` to disable
1621
markComment: >
17-
This issue has been automatically marked as stale because it has not had
18-
recent activity. It will be closed if no further activity occurs. Thank you
19-
for your contributions.
22+
A friendly reminder that this issue had no activity for 60 days.
2023
2124
# Comment to post when closing a stale issue. Set to `false` to disable
2225
closeComment: false
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
8+
9+
jobs:
10+
continuous_integration_build:
11+
continue-on-error: true
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
ruby: [2.3, 2.7]
16+
operating-system: [ubuntu-latest]
17+
include:
18+
- ruby: head
19+
operating-system: ubuntu-latest
20+
- ruby: truffleruby-head
21+
operating-system: ubuntu-latest
22+
- ruby: 2.7
23+
operating-system: windows-latest
24+
- ruby: jruby-head
25+
operating-system: windows-latest
26+
27+
name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
28+
29+
runs-on: ${{ matrix.operating-system }}
30+
31+
steps:
32+
- name: Checkout Code
33+
uses: actions/checkout@v2
34+
35+
- name: Setup Ruby
36+
uses: ruby/setup-ruby@v1
37+
with:
38+
ruby-version: ${{ matrix.ruby }}
39+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
40+
41+
- name: Run Build
42+
run: bundle exec rake default

.travis.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change Log
22

3+
## 1.7.0
4+
5+
See https://github.com/ruby-git/ruby-git/releases/tag/v1.7.0
6+
7+
## 1.6.0
8+
9+
See https://github.com/ruby-git/ruby-git/releases/tag/v1.6.0
10+
11+
## 1.6.0.pre1
12+
13+
See https://github.com/ruby-git/ruby-git/releases/tag/v1.6.0.pre1
14+
315
## 1.5.0
416

517
See https://github.com/ruby-git/ruby-git/releases/tag/v1.5.0

CONTRIBUTING.md

Lines changed: 89 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,118 @@
11
# Contributing to ruby-git
22

3-
Thank you for your interest in contributing to this project.
3+
Thank you for your interest in contributing to the ruby-git project.
44

5-
These are mostly guidelines, not rules.
6-
Use your best judgment, and feel free to propose changes to this document in a pull request.
5+
This document gives the guidelines for contributing to the ruby-git project.
6+
These guidelines may not fit every situation. When contributing use your best
7+
judgement.
78

8-
#### Table Of Contents
9+
Propose changes to these guidelines with a pull request.
910

10-
[How Can I Contribute?](#how-can-i-contribute)
11-
* [Submitting Issues](#submitting-issues)
12-
* [Contribution Process](#contribution-process)
13-
* [Pull Request Requirements](#pull-request-requirements)
14-
* [Code Review Process](#code-review-process)
15-
* [Developer Certification of Origin (DCO)](#developer-certification-of-origin-dco)
11+
## How to contribute to ruby-git
1612

13+
You can contribute in two ways:
1714

18-
## How Can I Contribute?
15+
1. [Report an issue or make a feature request](#how-to-report-an-issue-or-make-a-feature-request)
16+
2. [Submit a code or documentation change](#how-to-submit-a-code-or-documentation-change)
1917

20-
### Submitting Issues
18+
## How to report an issue or make a feature request
2119

22-
We utilize **GitHub Issues** for issue tracking and contributions. You can contribute in two ways:
20+
ruby-git utilizes [GitHub Issues](https://help.github.com/en/github/managing-your-work-on-github/about-issues)
21+
for issue tracking and feature requests.
2322

24-
1. Reporting an issue or making a feature request [here](https://github.com/ruby-git/ruby-git/issues/new).
25-
2. Adding features or fixing bugs yourself and contributing your code to ruby-git.
23+
Report an issue or feature request by [creating a ruby-git Github issue](https://github.com/ruby-git/ruby-git/issues/new).
24+
Fill in the template to describe the issue or feature request the best you can.
2625

27-
### Contribution Process
26+
## How to submit a code or documentation change
2827

29-
We have a 3 step process for contributions:
28+
There is three step process for code or documentation changes:
3029

31-
1. Commit changes to a git branch in your fork. Making sure to sign-off those changes for the [Developer Certificate of Origin](#developer-certification-of-origin-dco).
32-
2. Create a GitHub Pull Request for your change, following the instructions in the pull request template.
33-
3. Perform a [Code Review](#code-review-process) with the project maintainers on the pull request.
30+
1. [Commit your changes to a fork of ruby-git](#commit-changes-to-a-fork-of-ruby-git)
31+
2. [Create a pull request](#create-a-pull-request)
32+
3. [Get your pull request reviewed](#get-your-pull-request-reviewed)
3433

35-
### Pull Request Requirements
36-
In order to ensure high quality, we require that all pull requests to this project meet these specifications:
34+
### Commit changes to a fork of ruby-git
3735

38-
1. Unit Testing: We require all the new code to include unit tests, and any fixes to pass previous units.
39-
2. Green CI Tests: We are using [Travis CI](https://travis-ci.org/ruby-git/ruby-git) to run unit tests on various ruby versions, we expect them to all pass before a pull request will be merged.
40-
3. Up-to-date Documentation: New methods as well as updated methods should have [YARD](https://yardoc.org/) documentation added to them
36+
Make your changes in a fork of the ruby-git repository.
4137

42-
### Code Review Process
38+
Each commit must include a [DCO sign-off](#developer-certificate-of-origin-dco)
39+
by adding the line `Signed-off-by: Name <email>` to the end of the commit
40+
message.
4341

44-
Code review takes place in GitHub pull requests. See [this article](https://help.github.com/articles/about-pull-requests/) if you're not familiar with GitHub Pull Requests.
42+
### Create a pull request
4543

46-
Once you open a pull request, project maintainers will review your code and respond to your pull request with any feedback they might have.
44+
See [this article](https://help.github.com/articles/about-pull-requests/) if you
45+
are not familiar with GitHub Pull Requests.
4746

48-
The process at this point is as follows:
47+
Follow the instructions in the pull request template.
4948

50-
1. One thumbs-up (:+1:) is required from project maintainers. See the master maintainers document for the ruby-git project at <https://github.com/ruby-git/ruby-git/blob/master/MAINTAINERS.md>.
51-
2. When ready, your pull request will be merged into `master`, we may require you to rebase your PR to the latest `master`.
49+
### Get your pull request reviewed
5250

53-
### Developer Certification of Origin (DCO)
51+
Code review takes place in a GitHub pull request using the [the Github pull request review feature](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews).
5452

55-
Licensing is very important to open source projects. It helps ensure the software continues to be available under the terms that the author desired.
53+
Once your pull request is ready for review, request a review from at least one
54+
[maintainer](MAINTAINERS.md) and any number of other contributors.
5655

57-
ruby-git uses [the MIT license](https://github.com/ruby-git/ruby-git/blob/master/LICENSE)
56+
During the review process, you may need to make additional commits which would
57+
need to be squashed. It may also be necessary to rebase to master again if other
58+
changes are merged before your PR.
5859

59-
Detail about the LICENSE can be found [here](https://choosealicense.com/licenses/mit/)
60+
At least one approval is required from a project maintainer before your pull
61+
request can be merged. The maintainer is responsible for ensuring that the pull
62+
request meets [the project's coding standards](#coding-standards).
6063

61-
To make a good faith effort to ensure these criteria are met, ruby-git requires the Developer Certificate of Origin (DCO) process to be followed.
64+
## Coding standards
6265

63-
The DCO is an attestation attached to every contribution made by every developer.
66+
In order to ensure high quality, all pull requests must meet these requirements:
6467

65-
In the commit message of the contribution, the developer simply adds a Signed-off-by statement and thereby agrees to the DCO, which you can find below or at <http://developercertificate.org/>.
68+
### 1 PR = 1 Commit
69+
* All commits for a PR must be squashed into one commit
70+
* To avoid an extra merge commit, the PR must be able to be merged as [a fast forward merge](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging)
71+
* The easiest way to ensure a fast forward merge is to rebase your local branch
72+
to the ruby-git master branch
73+
74+
### Unit tests
75+
* All changes must be accompanied by new or modified unit tests
76+
* The entire test suite must pass when `bundle exec rake test` is run from the
77+
project's local working copy
78+
79+
### Continuous Integration
80+
* All tests must pass in the project's [Travis CI](https://travis-ci.org/ruby-git/ruby-git)
81+
build before the pull request will be merged
82+
83+
### Documentation
84+
* New and updated public methods must have [YARD](https://yardoc.org/)
85+
documentation added to them
86+
* New and updated public facing features should be documented in the project's
87+
[README.md](README.md)
88+
89+
### Licensing sign-off
90+
* Each commit must contain [the DCO sign-off](#developer-certificate-of-origin-dco)
91+
in the form: `Signed-off-by: Name <email>`
92+
93+
## Licensing
94+
95+
ruby-git uses [the MIT license](https://choosealicense.com/licenses/mit/) as
96+
declared in the [LICENSE](LICENSE) file.
97+
98+
Licensing is very important to open source projects. It helps ensure the
99+
software continues to be available under the terms that the author desired.
100+
101+
### Developer Certificate of Origin (DCO)
102+
103+
This project requires that authors have permission to submit their contributions
104+
under the MIT license. To make a good faith effort to ensure this, ruby-git
105+
requires the [Developer Certificate of Origin (DCO)](https://elinux.org/Developer_Certificate_Of_Origin)
106+
process be followed.
107+
108+
This process requires that each commit include a `Signed-off-by` line that
109+
indicates the author accepts the DCO. Here is an example DCO sign-off line:
110+
111+
```
112+
Signed-off-by: John Doe <john.doe@hisdomain.com>
113+
```
114+
115+
The full text of the DCO version 1.1 is below or at <http://developercertificate.org/>.
66116

67117
```
68118
Developer's Certificate of Origin 1.1
@@ -75,7 +125,7 @@ By making a contribution to this project, I certify that:
75125
76126
(b) The contribution is based upon previous work that, to the
77127
best of my knowledge, is covered under an appropriate open
78-
source license and I have the right under that license to
128+
source license and I have the right under that license to
79129
submit that work with modifications, whether created in whole
80130
or in part by me, under the same open source license (unless
81131
I am permitted to submit under a different license), as

MAINTAINERS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Maintainers
22

3-
When making changes to the system, this file tells you who needs to review your patch - you need at least two maintainers to provide a :+1: on your pull request.
3+
When making changes in this repository, one of the maintainers below must review and approve your pull request.
44

55
### Maintainers
66

77
* [Per Lundberg](https://github.com/perlun)
8-
* [Vern Burton](https://github.com/tarcinil)
8+
* [Vern Burton](https://github.com/tarcinil)
9+
* [James Couball](https://github.com/jcouball)

PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Your checklist for this pull request
2-
🚨Please review the [guidelines for contributing](../CONTRIBUTING.md) to this repository.
2+
🚨Please review the [guidelines for contributing](https://github.com/ruby-git/ruby-git/blob/master/CONTRIBUTING.md) to this repository.
33

44
- [ ] Ensure all commits include DCO sign-off.
55
- [ ] Ensure that your contributions pass unit testing.

0 commit comments

Comments
 (0)