Skip to content

Commit 75d17a1

Browse files
authored
Merge branch 'master' into extconf-optional-makefile
2 parents feaf100 + 20b093f commit 75d17a1

File tree

3,569 files changed

+115188
-130154
lines changed

Some content is hidden

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

3,569 files changed

+115188
-130154
lines changed

.changelog.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22

3-
header_template: "# %new_version / %release_date"
3+
header_template: "## %new_version / %release_date"
44

55
entry_template: "* %title. Pull request [#%pull_request_number](%pull_request_url) by %pull_request_author"
66

@@ -13,15 +13,15 @@ release_date_format: "%Y-%m-%d"
1313
entry_wrapping: 74
1414

1515
changelog_label_mapping:
16-
"rubygems: security": "## Security:"
17-
"rubygems: breaking change": "## Breaking changes:"
18-
"rubygems: deprecation": "## Deprecations:"
19-
"rubygems: feature": "## Features:"
20-
"rubygems: performance": "## Performance:"
21-
"rubygems: enhancement": "## Enhancements:"
22-
"rubygems: bug fix": "## Bug fixes:"
23-
"rubygems: documentation": "## Documentation:"
24-
"rubygems: backport": null
16+
"rubygems: security": "### Security:"
17+
"rubygems: breaking change": "### Breaking changes:"
18+
"rubygems: deprecation": "### Deprecations:"
19+
"rubygems: feature": "### Features:"
20+
"rubygems: performance": "### Performance:"
21+
"rubygems: enhancement": "### Enhancements:"
22+
"rubygems: bug fix": "### Bug fixes:"
23+
"rubygems: documentation": "### Documentation:"
24+
"rubygems: skip changelog": null
2525

2626
patch_level_labels:
2727
- "rubygems: security"
@@ -30,4 +30,4 @@ patch_level_labels:
3030
- "rubygems: bug fix"
3131
- "rubygems: performance"
3232
- "rubygems: documentation"
33-
- "rubygems: backport"
33+
- "rubygems: skip changelog"

.codeclimate.yml

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

.codespellignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
crate
2+
checkin
23
falsy
34
filetest
45
fo

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
check-filenames=
33
check-hidden=
44
ignore-words=.codespellignore
5-
skip=*.pem,.git,man,vcr_cassettes,vendor
5+
skip=CODE_OF_CONDUCT.md,*.pem,.git,./bundler/tmp,./bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt,man,vcr_cassettes,vendor,.venv

.devcontainer/Dockerfile

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM ruby:3.4-alpine@sha256:81096866ac15f906adc79867da3ed97a2aa271d6149363e216a174701345c53b
2+
3+
ENV USERNAME=vscode \
4+
UID=1000 \
5+
GID=1000
6+
7+
# Install the git-credential-manager package via the dotnet tooling to
8+
RUN apk update && apk add --no-cache \
9+
github-cli \
10+
git \
11+
build-base \
12+
bash \
13+
mandoc \
14+
man-pages \
15+
sudo
16+
17+
# create non-root group and user
18+
RUN addgroup -g $GID $USERNAME \
19+
&& adduser -s /bin/bash -u $UID -G $USERNAME $USERNAME --disabled-password --gecos ""
20+
21+
# set sudo permissions for vscode user
22+
RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
23+
RUN chmod 0440 /etc/sudoers.d/$USERNAME
24+
25+
USER $USERNAME

.devcontainer/devcontainer.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
{
3+
"name": "RubyGems",
4+
"build": {
5+
"dockerfile": "Dockerfile"
6+
},
7+
"remoteUser": "vscode",
8+
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
9+
// Use 'postCreateCommand' to run commands after the container is created.
10+
"onCreateCommand": "bin/rake setup",
11+
// Use 'updateContentCommand' to run commands when the container is updated.
12+
"updateContentCommand": "bin/rake update",
13+
// Configure tool-specific properties.
14+
"containerEnv": {
15+
"EDITOR": "code --wait",
16+
"GIT_EDITOR": "code --wait"
17+
},
18+
"customizations": {
19+
"codespaces": {
20+
"openFiles": [
21+
"README.md",
22+
"CONTRIBUTING.md"
23+
]
24+
},
25+
"vscode": {
26+
"extensions": [
27+
"Shopify.ruby-lsp"
28+
]
29+
}
30+
}
31+
}

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ b0d532adb80521271fbde4d3955c252f2ee09a5c
1111
cf58bc4b1ee83b2697fbdbcc76ced09515525141
1212
# [RuboCop] Enable Style/EmptyLines
1313
ff426fdbc1bde3582b6e1d5137abd21d74c38f87
14+
# Use modern hashes consistently
15+
bb66253f2ceddee527b82971423348d8bbc1b606

.githooks/pre-commit-rubocop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ length=${#files}
55

66
# Run rubocop hook only when analyzable files are present
77
if [[ $length -ne 0 ]]; then
8-
./bin/rubocop $files
8+
./bin/rubocop --only-recognized-file-types $files
99
else
1010
echo "No files to analyze"
1111
fi

.github/ISSUE_TEMPLATE/bundler-related-issue.md

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,15 @@ assignees: ''
99

1010
<!--
1111
12-
Thank you for contributing to the [rubygems](https://github.com/rubygems/rubygems) repository, and specifically to the [Bundler](https://bundler.io/) gem.
12+
Thank you for contributing to the rubygems) repository, and specifically to the Bundler gem.
1313
14-
Sometimes you can find a solution to your issue by reading some documentation.
15-
16-
* Instructions for common Bundler uses can be found on the [Bundler documentation site](https://bundler.io/).
17-
* Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](https://bundler.io/man/bundle.1.html) or [Bundler Command Line Reference](https://bundler.io/commands.html).
18-
* We also have a document detailing solutions to common problems: https://github.com/rubygems/rubygems/blob/master/bundler/doc/TROUBLESHOOTING.md.
19-
20-
If you're still stuck, please fill in the following sections so we can process your issue as fast as possible:
14+
Please fill in the following sections so we can process your issue as fast as possible
2115
2216
-->
2317

2418
### Describe the problem as clearly as you can
2519

26-
<!-- Replace this with an explanation of the problem you are having. Be as much clear and precise as you can. -->
20+
<!-- Replace this with an explanation of your problem. Be as clear and precise as you can. -->
2721

2822
### Did you try upgrading rubygems & bundler?
2923

@@ -44,7 +38,7 @@ might do the trick, and will also save us some time :)
4438

4539
<!--
4640
47-
Fill this with a list of steps maintainers can follow to reproduce your issue. Note that while you are seeing this issue in your computer, maintainers might not see the same thing on theirs. There is a number of things that could influence this:
41+
Fill this with a list of steps maintainers can follow to reproduce your issue. Note that while you see this issue in your computer, maintainers might not see the same thing on theirs. There are many things that could influence this:
4842
4943
* How your ruby is setup (OS package, from source, using a version manager).
5044
* How bundler & rubygems are configured.
@@ -53,7 +47,7 @@ Fill this with a list of steps maintainers can follow to reproduce your issue. N
5347
5448
The more complete the steps to simulate your particular environment are, the easier it will be for maintainers to reproduce your issue on their machines.
5549
56-
Ideally, we recommend you to set up the list of steps as a [Dockerfile](https://docs.docker.com/get-started/). A Dockerfile provides a neutral environment that should give the same results, no matter where it's run.
50+
Ideally, we recommend you set up the list of steps as a Dockerfile. A Dockerfile provides a neutral environment that should give the same results, no matter where it's run.
5751
5852
-->
5953

@@ -65,9 +59,11 @@ Ideally, we recommend you to set up the list of steps as a [Dockerfile](https://
6559

6660
<!-- Replace this with the results you expected before running the command. -->
6761

68-
### What actually happened?
62+
### What happened instead?
6963

70-
<!-- Replace this with the actual result you got. Paste the output of your command here. -->
64+
````
65+
Replace this with the actual result you got. Paste the output of your command here.
66+
````
7167

7268
### If not included with the output of your command, run `bundle env` and paste the output below
7369

.github/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ newPRWelcomeComment: |
55
66
If you have any questions or concerns that you wish to ask, feel free to leave a comment in this PR or join our #rubygems or #bundler channel on [Slack](http://slack.bundler.io/).
77
8-
For more information about contributing to the RubyGems project feel free to review our [CONTRIBUTING](https://github.com/rubygems/rubygems/blob/master/CONTRIBUTING.md) guide
8+
For more information about contributing to the RubyGems project feel free to review our [CONTRIBUTING](https://github.com/rubygems/rubygems/blob/master/doc/rubygems/CONTRIBUTING.md) guide

0 commit comments

Comments
 (0)