Skip to content

Drop Rails 4.2 support #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 2, 2021
Merged

Conversation

olbrich
Copy link
Contributor

@olbrich olbrich commented Mar 29, 2021

  • Drops conditional handling of Rails versions < 5.0

Fixes #202

@olbrich olbrich self-assigned this Mar 29, 2021
@olbrich olbrich added ⬆️ dependencies Pull requests that update a dependency file 🏗️ maintenance 🚧 WIP Work in progress #️⃣.#️⃣ Minor added functionality in a backwards-compatible manner labels Mar 29, 2021
jobs:
run-tests:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
orm: [active_record, mongoid]
rails: ['4.2', '5.0', '5.1', '5.2', '6.0']
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dropping 4.2 here and from conditionals is the major change here

@olbrich olbrich added this to the 0.16.0 milestone Mar 29, 2021
@coveralls
Copy link
Collaborator

coveralls commented Mar 29, 2021

Coverage Status

Coverage decreased (-0.1%) to 97.59% when pulling aa6af8c on olbrich:olbrich/issue202 into 43335ee on devise-security:master.

Copy link
Contributor

@dillonwelch dillonwelch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LOVE IT!

One small thing I think we can clean up:

Since we aren't using Mongoid.4 anymore (since that was for Rails 4.2), we can get rid of the conditionals in these two files.

https://github.com/devise-security/devise-security/blob/f2d3fe8a4a2a28bc6764b6c3b437e3887cb4ebe0/test/dummy/config/mongoid.yml
https://github.com/devise-security/devise-security/blob/f2d3fe8a4a2a28bc6764b6c3b437e3887cb4ebe0/test/support/mongoid.yml

@dillonwelch dillonwelch mentioned this pull request Mar 30, 2021
@olbrich olbrich marked this pull request as ready for review April 25, 2021 16:17
olbrich added 2 commits April 25, 2021 12:19
- Drops conditional handling of Rails versions < 5.0

Fixes devise-security#202
@olbrich olbrich removed the 🚧 WIP Work in progress label Apr 25, 2021
Copy link
Contributor

@dillonwelch dillonwelch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, not sure if you want to coordinate anything else before merging so I'll let you handle that.

@olbrich olbrich merged commit 17b8543 into devise-security:master May 2, 2021
@olbrich olbrich deleted the olbrich/issue202 branch May 2, 2021 20:08
Copy link
Collaborator

@tmr08c tmr08c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Late review, but 👍

end

group :mongoid do
gem 'mongoid'
gem 'mongoid', '~> 6.0'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious about why we need to specify a version here

<%= Mongoid::VERSION.to_i > 4 ? 'clients' : 'sessions' %>:
clients:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this why we specify mongoid to be version 6 in our base Gemfil?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⬆️ dependencies Pull requests that update a dependency file 🏗️ maintenance #️⃣.#️⃣ Minor added functionality in a backwards-compatible manner
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Drop Rails 4.2 support
4 participants