Skip to content

Commit

Permalink
Merge pull request #312 from thoughtbot/sb-some-version-updates-and-d…
Browse files Browse the repository at this point in the history
…ependabot

Some version updates and dependabot
  • Loading branch information
Stefanni Brasil authored Mar 19, 2024
2 parents abd24e7 + 1486f5f commit 9cabd66
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 25 deletions.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: 2

updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 5

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
time: "02:00"
timezone: "Etc/UTC"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
name: Specs - Ruby ${{ matrix.ruby-version }} with ${{ matrix.gemfile }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby ${{ matrix.ruby-version }} with ${{ matrix.gemfile }}
uses: ruby/setup-ruby@v1
with:
Expand Down
57 changes: 39 additions & 18 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,62 @@
# Contributing Guide

## Code of Conduct

We welcome pull requests from everyone. By participating in this project, you
agree to abide by the thoughtbot [code of conduct].

We expect everyone to follow the code of conduct anywhere in thoughtbot's
project codebases, issue trackers, chat-rooms, and mailing lists.

[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct

### Running the application locally

```sh
bundle
```

Run the tests:

```sh
bundle exec rake
```

## Opening a PR

We love pull requests from everyone. By participating in this project, you
agree to abide by the thoughtbot [code of conduct].

[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct

1. Fork the repo.

2. Run the tests. We only take pull requests with passing tests, and it's great
to know that you have a clean slate: `bundle && rake`

to know that you have a clean slate: `bundle && rake`
3. Add a test for your change. Only refactoring and documentation changes
require no new tests. If you are adding functionality or fixing a bug, we need
a test!

require no new tests. If you are adding functionality or fixing a bug, we need
a test!
4. Make the test pass.

5. Push to your fork and submit a pull request.


At this point you're waiting on us. We like to at least comment on, if not
accept, pull requests within three business days (and, typically, one business
day). We may suggest some changes or improvements or alternatives.

Some things that will increase the chance that your pull request is accepted,
taken straight from the Ruby on Rails guide:

* Use Rails idioms and helpers
* Include tests that fail without your code, and pass with it
* Update the documentation, the surrounding one, examples elsewhere, guides,
- Use Rails idioms and helpers
- Include tests that fail without your code, and pass with it
- Update the documentation, the surrounding one, examples elsewhere, guides,
whatever is affected by your contribution

Syntax:
### Syntax

* Two spaces, no tabs.
* No trailing whitespace. Blank lines should not have any space.
* Prefer &&/|| over and/or.
* MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
* a = b and not a=b.
* Follow the conventions you see used in the source already.
- Two spaces, no tabs.
- No trailing whitespace. Blank lines should not have any space.
- Prefer &&/|| over and/or.
- MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
- a = b and not a=b.
- Follow the conventions you see used in the source already.

And in case we didn't emphasize it enough: we love tests!
8 changes: 5 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,16 @@ GEM
nokogiri (>= 1.5.9)
method_source (1.0.0)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_portile2 (2.8.5)
minitest (5.14.2)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.16.3)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
racc (1.7.3)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ You can run:
Or you can include in your Gemfile:

```ruby
gem 'high_voltage', '~> 3.1'
gem 'high_voltage', '~> 3.1.2'
```

## Usage
Expand Down Expand Up @@ -370,12 +370,13 @@ Thank you, [contributors]!

## License

High Voltage is copyright © 2009-2024 thoughtbot. It is free software, and may
High Voltage is copyright © 2009 thoughtbot. It is free software, and may
be redistributed under the terms specified in the [`LICENSE`] file.

[`LICENSE`]: /MIT-LICENSE

<!-- START /templates/footer.md -->

## About thoughtbot

![thoughtbot](https://thoughtbot.com/thoughtbot-logo-for-readmes.svg)
Expand All @@ -390,5 +391,4 @@ We are [available for hire][hire].
[community]: https://thoughtbot.com/community?utm_source=github
[hire]: https://thoughtbot.com/hire-us?utm_source=github


<!-- END /templates/footer.md -->

0 comments on commit 9cabd66

Please sign in to comment.