Skip to content
This repository was archived by the owner on Feb 11, 2025. It is now read-only.

True-up with Upstream#3

Merged
zachmargolis merged 34 commits intomasterfrom
margolis-true-up-with-upstream
Nov 15, 2021
Merged

True-up with Upstream#3
zachmargolis merged 34 commits intomasterfrom
margolis-true-up-with-upstream

Conversation

@zachmargolis
Copy link

I did:

git checkout -b roidrage/master roidrage-master
git checkout -b  margolis-true-up-with-upstream
git merge -s ours 18f/master

which should essentially reset our fork to the current top of roidrage/redis-session-store (another option would have been to force push/git reset hard, but I decided this keeps history a little better)

Next step will be to copy this branch: roidrage#125 into this fork

jpawlyn and others added 30 commits May 30, 2017 18:25
Set minimum config for rubocop to show no offenses
* Travis: use jruby-9.1.8.0

* Lint

* Travis: jruby-9.1.9.0

* Travis: jruby-9.1.12.0

* Travis: jruby-9.1.13.0
* Rails 5.2 support

* Fix Rubocop offences
…drage#102)

* Decode sesssion with_indifferent_access if defined ActiveSupport

* Decode sesssion with_indifferent_access if defined ActiveSupport
**Why**: The :expire_after config option controls both the Redis
session expiration and the expiration of the Rails session cookie.
Adding a new config option :ttl allows those controls to be
managed separately.

The most common case would be if you wanted the Rails cookie
to expire when the browser is closed, as it would if :expire_after
were set to `nil`.
* Remove the `has_rdoc` flag from the `.gemspec` file. Rubygems
  has deprecated thios parameter and will be removing it in future
  versions.

SEE: https://blog.rubygems.org/2009/05/04/1.3.3-released.html
We are trying to test our application on rails 6.0.0.alpha but we can't install this because of the version lock
Probably this will be helpful that we can try and report any issues with edge rails
* CI matrix: Add 2.6.0, update to jruby-9.2.5.0

* CI: Use 2.6.1, jruby-9.2.6.0

* CI: 2.5.5, 2.6.2

* CI: jruby-9.2.7.0

* CI: Use jruby-9.2.8.0

* RuboCop linting
This fixes following warnings:

```
/home/y-yagi/src/github.com/y-yagi/redis-session-store/.rubocop.yml: Warning: no department given for FileName.
/home/y-yagi/src/github.com/y-yagi/redis-session-store/.rubocop.yml: Warning: no department given for DoubleNegation.
.rubocop.yml: Metrics/LineLength has the wrong namespace - should be Layout
```
…ge#119)

* Update key existence check to use newer #exists? if available

- Silences deprecation warning starting in redis gem v4.2

* Add myself to authors

* Update CHANGELOG
@zachmargolis zachmargolis merged commit 3b6d700 into master Nov 15, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.