Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: heartcombo/devise
base: v4.4.1
Choose a base ref
...
head repository: heartcombo/devise
compare: v4.4.3
Choose a head ref
  • 19 commits
  • 32 files changed
  • 9 contributors

Commits on Jan 23, 2018

  1. Support for :credentials on Rails v5.2.x. (#4712)

    This fixes #4710.
    
    Rails introduced :secrets in v5.1. They somehow changed it to :credentials. This fix represents this change.
    
    Devise will now look :credentials first, then fallback to :secrets for 5.1.x compatibility then it will check for standard secret key. If three not found then exception will arise.
    gencer authored and tegon committed Jan 23, 2018
    Copy the full SHA
    bdd6081 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2018

  1. Copy the full SHA
    8b53975 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. Allow rails 6

    Fudoshiki committed Feb 21, 2018
    Copy the full SHA
    2514c69 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2018

  1. Test on Rails 5.2.0.rc1 (#4711)

    jcoyne authored and tegon committed Feb 22, 2018
    Copy the full SHA
    a45bbe1 View commit details
    Browse the repository at this point in the history
  2. change right border

    Fudoshiki committed Feb 22, 2018
    Copy the full SHA
    5919620 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #4779 from Fudoshiki/master

    Allow test rails 6
    rafaelfranca committed Feb 22, 2018
    Copy the full SHA
    9001123 View commit details
    Browse the repository at this point in the history
  4. Update CHANGELOG.md [ci skip]

    tegon committed Feb 22, 2018
    Copy the full SHA
    f141bb5 View commit details
    Browse the repository at this point in the history
  5. Update CHANGELOG.md [ci skip]

    tegon committed Feb 22, 2018
    Copy the full SHA
    6bda962 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Preserve content_type for unauthenticated tests

    In Rails 4, for unauthenticated controller tests which trigger the
    failure app, ensure that the simulated failure response includes a
    content_type (broken in bb44d42).
    
    This works in Rails5, which parses the content-type header on-demand,
    but not in Rails4 which requires setting the response's content_type
    explicitly.
    
    Fixes #4783.
    Gordon McNaughton committed Feb 26, 2018
    Copy the full SHA
    3e23371 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4784 from gmcnaughton/fix-controller-tests-conten…

    …t_type
    
    Fixes #4783 - preserve content_type for unauthenticated test responses
    rafaelfranca committed Feb 26, 2018
    Copy the full SHA
    d545fe3 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. Creating a new section for controller configuration on devise.rb temp…

    …late
    
    Creating a new section called `Controller configuration`.
    
    An optional devise configuration is set `config.parent_controller` but this configuration is missing in the `devise.rb` template file.
    Danilo-Araujo-Silva authored and tegon committed Mar 14, 2018
    Copy the full SHA
    8ab7963 View commit details
    Browse the repository at this point in the history
  2. Check if the record is persisted in update_tracked_fields!

    In some cases, invalid records could be created during the signup
    process because we were calling `save(validate: false)` inside the
    `update_tracked_fields!` method. See
    #4673 for more
    information.
    This was fixed on #4674 by
    calling `save` directly, but it caused some trouble and confusion since
    it changed Devise's behavior significantly.
    We talked about on #4790
    and it doesn't even make sense to call `save` on an object that isn't
    persisted yet, so I've added a guard clause to the
    `update_tracked_fields!` method.
    
    Fixes #4790
    tegon committed Mar 14, 2018
    Copy the full SHA
    d870c0d View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    5664b19 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2018

  1. 1
    Copy the full SHA
    3722aa6 View commit details
    Browse the repository at this point in the history
  2. Update CHANGELOG.md

    tegon committed Mar 15, 2018
    Copy the full SHA
    fc45f91 View commit details
    Browse the repository at this point in the history
  3. Prepare for 4.4.2 release

    tegon committed Mar 15, 2018
    Copy the full SHA
    0d27941 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2018

  1. Fix Devise::Test::ControllerHelpers

    This was broken on 3e23371#diff-bafaaa60fc003e648eb4981c9add523eR142
    because of a call to the method `Devise::Test.rails5?` which is only
    defined inside our test suite's rails app https://github.com/plataformatec/devise/blob/a45bbe1783e4b46af15825a0bb2eb5917a9b8726/test/rails_app/config/boot.rb#L19
    This commits checks for the rails version directly.
    tegon committed Mar 16, 2018
    Copy the full SHA
    64aad8b View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2018

  1. Create Devise::SecretKeyFinder

    When supporting Rails 5.2 credentials on
    #4712, we ended up breaking
    apps that were upgraded to Rails 5.2 and weren't using `credentials`
    to store their `secret_key_base`. See
    #4807 for more context.
    To fix it, we're now checking whether the key is present before using it.
    Since there weren't any automated test for this - the conditionals were
    in a Rails engine initializer - I've extracted it to a new class so that
    we are able to test it easily.
    
    Fixes #4807
    tegon committed Mar 17, 2018
    Copy the full SHA
    962cea2 View commit details
    Browse the repository at this point in the history
  2. Prepare for 4.4.3 release

    tegon committed Mar 17, 2018
    Copy the full SHA
    75f9e76 View commit details
    Browse the repository at this point in the history