Skip to content

Commit

Permalink
Merge pull request #331 from onetimesecret/330-wrong-version-of-‎uri-…
Browse files Browse the repository at this point in the history
…redis‎-in-gemfilelock

[#330] Fix for uri-redis version (🙏 @Lightning-)
  • Loading branch information
delano committed May 14, 2024
2 parents 2280ef7 + eacf9e5 commit 433cd2f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 13 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ jobs:
bundler: '2.4.22'
rubygems: '3.2.3'

- ruby: '2.6'
bundler: '2.4.22'
rubygems: '3.2.3'

# Make redis available for running the tryouts
services:
redis:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
# normal maintenance until: TBD
# EOL: 2026-03-31 (expected)
#
# We maintain Ruby 2.6+ support for the time being for
# We maintain Ruby 2.7+ support for the time being for
# anyone wanting to run the latest code but are not
# able to update the system to Ruby 3 just yet (not
# uncommon in legacy environments).
ruby '>= 2.6.8'
ruby '>= 2.7.8'

plugin 'bundler-graph'

Expand All @@ -33,7 +33,7 @@ gem 'otto', '~> 1.0', '>= 1.0'
gem 'redis', '~> 4.8'
gem 'storable'
gem 'sysinfo'
gem 'uri-redis', '~> 1.1.1'
gem 'uri-redis', '~> 1.1.2'

gem 'bcrypt'
gem 'encryptor', '= 1.1.3'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ GEM
tryouts (2.2.0)
sysinfo (~> 0.10)
unicode-display_width (2.5.0)
uri-redis (1.1.1)
uri-redis (1.1.2)
redis (~> 4.1, >= 4.1.0)
yajl-ruby (1.4.3)

Expand Down Expand Up @@ -131,7 +131,7 @@ DEPENDENCIES
sysinfo
thin
tryouts
uri-redis (~> 1.1.1)
uri-redis (~> 1.1.2)
yajl-ruby

RUBY VERSION
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

### Latest releases

* **Ruby 3+: [v0.13.0-RC6](https://github.com/onetimesecret/onetimesecret/releases/tag/v0.13.0-RC6)**
* Ruby 2.6, 2.7: [v0.12.1](https://github.com/onetimesecret/onetimesecret/releases/tag/v0.12.1)
* **Ruby 3+ (recommended), 2.7.8: [v0.13.0-RC7](https://github.com/onetimesecret/onetimesecret/releases/tag/v0.13.0-RC7)**
* Ruby 2.7, 2.6: [v0.12.1](https://github.com/onetimesecret/onetimesecret/releases/tag/v0.12.1)

---

Expand All @@ -26,9 +26,9 @@ When you send people sensitive info like passwords and private links via email o

### System Requirements

* Any recent linux distor (we use debian) or *BSD
* Any recent linux disto (we use debian) or *BSD
* System dependencies:
* Ruby 3.0, 3.1, 3.2
* Ruby 3.2, 3.1, 3.0, 2.7.8
* Redis server 5+
* Minimum specs:
* 2 core CPU (or equivalent)
Expand Down

0 comments on commit 433cd2f

Please sign in to comment.