diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-04 13:33:58 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-04 13:33:58 +0000 |
| commit | 8fff6a3422e07ad45c1e8875476427eb81bb0e2e (patch) | |
| tree | 68f2fc0b52e5ec6e93dc004c911a423965eac7ea | |
| parent | 990feb9f2b886c5bd0ac37339f149b8e80202019 (diff) | |
| parent | f7a61c4a444cafd52fa8b90cc3c0a700dcefc26b (diff) | |
| download | gitlab-ce-8fff6a3422e07ad45c1e8875476427eb81bb0e2e.tar.gz | |
Merge branch 'rs-issue-35701' into 'master'
Ensure DeviseHelpers is loaded before inclusion in LoginHelpers
Closes #35701
See merge request !13261
| -rw-r--r-- | spec/support/login_helpers.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb index c714d1b08a6..3e117530151 100644 --- a/spec/support/login_helpers.rb +++ b/spec/support/login_helpers.rb @@ -1,3 +1,5 @@ +require_relative 'devise_helpers' + module LoginHelpers include DeviseHelpers |