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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.5.10
Choose a base ref
...
head repository: heartcombo/devise
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.3.0
Choose a head ref
68 contributors
Loading
Showing with 3,149 additions and 3,369 deletions.
  1. +26 −12 .travis.yml
  2. +162 −1,131 CHANGELOG.md
  3. +72 −9 CONTRIBUTING.md
  4. +18 −7 Gemfile
  5. +133 −122 Gemfile.lock
  6. +1 −1 MIT-LICENSE
  7. +120 −55 README.md
  8. +1 −1 app/controllers/devise/confirmations_controller.rb
  9. +5 −5 app/controllers/devise/omniauth_callbacks_controller.rb
  10. +4 −4 app/controllers/devise/passwords_controller.rb
  11. +9 −8 app/controllers/devise/registrations_controller.rb
  12. +7 −7 app/controllers/devise/sessions_controller.rb
  13. +2 −2 app/controllers/devise/unlocks_controller.rb
  14. +20 −9 app/controllers/devise_controller.rb
  15. +4 −0 app/mailers/devise/mailer.rb
  16. +1 −1 app/views/devise/confirmations/new.html.erb
  17. +7 −0 app/views/devise/mailer/email_changed.html.erb
  18. +4 −0 app/views/devise/registrations/edit.html.erb
  19. +13 −0 bin/test
  20. +2 −0 config/locales/en.yml
  21. +2 −3 devise.gemspec
  22. +0 −29 gemfiles/Gemfile.rails-3.2-stable
  23. +0 −172 gemfiles/Gemfile.rails-3.2-stable.lock
  24. +0 −29 gemfiles/Gemfile.rails-4.0-stable
  25. +0 −166 gemfiles/Gemfile.rails-4.0-stable.lock
  26. +7 −6 gemfiles/Gemfile.rails-4.1-stable
  27. +94 −95 gemfiles/Gemfile.rails-4.1-stable.lock
  28. +7 −6 gemfiles/Gemfile.rails-4.2-stable
  29. +96 −98 gemfiles/Gemfile.rails-4.2-stable.lock
  30. +34 −0 gemfiles/Gemfile.rails-5.0-stable
  31. +193 −0 gemfiles/Gemfile.rails-5.0-stable.lock
  32. +104 −0 guides/bug_report_templates/integration_test.rb
  33. +54 −40 lib/devise.rb
  34. +20 −19 lib/devise/controllers/helpers.rb
  35. +9 −2 lib/devise/controllers/rememberable.rb
  36. +25 −10 lib/devise/controllers/sign_in_out.rb
  37. +1 −1 lib/devise/controllers/store_location.rb
  38. +4 −4 lib/devise/encryptor.rb
  39. +50 −35 lib/devise/failure_app.rb
  40. +4 −1 lib/devise/hooks/lockable.rb
  41. +1 −1 lib/devise/hooks/proxy.rb
  42. +3 −2 lib/devise/hooks/timeoutable.rb
  43. +5 −4 lib/devise/mailers/helpers.rb
  44. +1 −1 lib/devise/models.rb
  45. +28 −3 lib/devise/models/authenticatable.rb
  46. +71 −26 lib/devise/models/confirmable.rb
  47. +44 −13 lib/devise/models/database_authenticatable.rb
  48. +7 −3 lib/devise/models/lockable.rb
  49. +30 −20 lib/devise/models/recoverable.rb
  50. +39 −25 lib/devise/models/rememberable.rb
  51. +0 −6 lib/devise/models/timeoutable.rb
  52. +7 −2 lib/devise/models/validatable.rb
  53. +12 −5 lib/devise/omniauth/url_helpers.rb
  54. +3 −1 lib/devise/orm/active_record.rb
  55. +4 −2 lib/devise/orm/mongoid.rb
  56. +129 −69 lib/devise/parameter_sanitizer.rb
  57. +4 −11 lib/devise/rails.rb
  58. +40 −31 lib/devise/rails/routes.rb
  59. +1 −10 lib/devise/rails/warden_compat.rb
  60. +3 −3 lib/devise/strategies/database_authenticatable.rb
  61. +3 −6 lib/devise/strategies/rememberable.rb
  62. +162 −0 lib/devise/test/controller_helpers.rb
  63. +61 −0 lib/devise/test/integration_helpers.rb
  64. +5 −124 lib/devise/test_helpers.rb
  65. +1 −41 lib/devise/token_generator.rb
  66. +1 −1 lib/devise/version.rb
  67. +11 −5 lib/generators/active_record/devise_generator.rb
  68. +2 −2 lib/generators/active_record/templates/migration.rb
  69. +2 −2 lib/generators/active_record/templates/migration_existing.rb
  70. +15 −0 lib/generators/devise/install_generator.rb
  71. +1 −18 lib/generators/devise/orm_helpers.rb
  72. +1 −8 lib/generators/templates/README
  73. +4 −4 lib/generators/templates/controllers/registrations_controller.rb
  74. +2 −2 lib/generators/templates/controllers/sessions_controller.rb
  75. +26 −18 lib/generators/templates/devise.rb
  76. +7 −0 lib/generators/templates/markerb/email_changed.markerb
  77. +2 −2 lib/generators/templates/markerb/password_change.markerb
  78. +0 −49 script/cached-bundle
  79. +0 −71 script/s3-put
  80. +6 −6 test/controllers/custom_registrations_controller_test.rb
  81. +8 −6 test/controllers/custom_strategy_test.rb
  82. +3 −2 test/controllers/helper_methods_test.rb
  83. +8 −8 test/controllers/helpers_test.rb
  84. +2 −2 test/controllers/inherited_controller_i18n_messages_test.rb
  85. +9 −11 test/controllers/internal_helpers_test.rb
  86. +1 −1 test/controllers/load_hooks_controller_test.rb
  87. +5 −4 test/controllers/passwords_controller_test.rb
  88. +24 −21 test/controllers/sessions_controller_test.rb
  89. +1 −1 test/controllers/url_helpers_test.rb
  90. +11 −11 test/devise_test.rb
  91. +43 −20 test/failure_app_test.rb
  92. +1 −27 test/generators/active_record_generator_test.rb
  93. +14 −3 test/generators/install_generator_test.rb
  94. +1 −1 test/helpers/devise_helper_test.rb
  95. +71 −102 test/integration/authenticatable_test.rb
  96. +15 −15 test/integration/confirmable_test.rb
  97. +7 −7 test/integration/database_authenticatable_test.rb
  98. +15 −14 test/integration/http_authenticatable_test.rb
  99. +6 −5 test/integration/lockable_test.rb
  100. +36 −0 test/integration/mounted_engine_test.rb
  101. +2 −2 test/integration/omniauthable_test.rb
  102. +16 −16 test/integration/recoverable_test.rb
  103. +21 −17 test/integration/registerable_test.rb
  104. +59 −18 test/integration/rememberable_test.rb
  105. +11 −11 test/integration/timeoutable_test.rb
  106. +4 −4 test/integration/trackable_test.rb
  107. +6 −6 test/mailers/confirmation_instructions_test.rb
  108. +130 −0 test/mailers/email_changed_test.rb
  109. +18 −0 test/mailers/mailer_test.rb
  110. +5 −5 test/mailers/reset_password_instructions_test.rb
  111. +5 −5 test/mailers/unlock_instructions_test.rb
  112. +3 −3 test/mapping_test.rb
  113. +74 −27 test/models/confirmable_test.rb
  114. +32 −20 test/models/database_authenticatable_test.rb
  115. +38 −16 test/models/lockable_test.rb
  116. +1 −1 test/models/omniauthable_test.rb
  117. +21 −11 test/models/recoverable_test.rb
  118. +1 −1 test/models/registerable_test.rb
  119. +76 −98 test/models/rememberable_test.rb
  120. +5 −0 test/models/serializable_test.rb
  121. +7 −7 test/models/timeoutable_test.rb
  122. +1 −1 test/models/trackable_test.rb
  123. +4 −12 test/models/validatable_test.rb
  124. +2 −2 test/models_test.rb
  125. +9 −7 test/omniauth/config_test.rb
  126. +4 −7 test/omniauth/url_helpers_test.rb
  127. +8 −1 test/orm/active_record.rb
  128. +51 −57 test/parameter_sanitizer_test.rb
  129. +1 −0 test/rails_app/app/active_record/user.rb
  130. +1 −1 test/rails_app/app/controllers/admins_controller.rb
  131. +3 −4 test/rails_app/app/controllers/application_controller.rb
  132. +5 −1 test/rails_app/app/controllers/home_controller.rb
  133. +2 −2 test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
  134. +5 −5 test/rails_app/app/controllers/users_controller.rb
  135. +5 −1 test/rails_app/config/application.rb
  136. +10 −4 test/rails_app/config/boot.rb
  137. +3 −1 test/rails_app/config/environments/production.rb
  138. +6 −2 test/rails_app/config/environments/test.rb
  139. +1 −1 test/rails_app/config/initializers/devise.rb
  140. +1 −6 test/rails_app/config/initializers/secret_token.rb
  141. +1 −0 test/rails_app/config/routes.rb
  142. +5 −1 test/rails_app/db/migrate/20100401102949_create_tables.rb
  143. +5 −1 test/rails_app/lib/shared_admin.rb
  144. +2 −1 test/rails_app/lib/shared_user.rb
  145. +1 −1 test/rails_app/lib/shared_user_without_omniauth.rb
  146. +30 −15 test/routes_test.rb
  147. +0 −11 test/support/assertions.rb
  148. +51 −0 test/support/http_method_compatibility.rb
  149. +1 −1 test/support/mongoid.yml
  150. +9 −0 test/support/webrat/integrations/rails.rb
  151. +14 −6 test/{test_helpers_test.rb → test/controller_helpers_test.rb}
  152. +32 −0 test/test/integration_helpers_test.rb
  153. +1 −1 test/test_models.rb
38 changes: 26 additions & 12 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,36 @@
language: ruby

rvm:
- 1.9.3
- 2.0.0
- 2.1
- 2.2
- 2.1.10
- 2.2.7
- 2.3.4
- 2.4.1
- ruby-head

gemfile:
- Gemfile
- gemfiles/Gemfile.rails-5.0-stable
- gemfiles/Gemfile.rails-4.2-stable
- gemfiles/Gemfile.rails-4.1-stable
- gemfiles/Gemfile.rails-4.0-stable
- gemfiles/Gemfile.rails-3.2-stable
- Gemfile

matrix:
exclude:
- rvm: 2.2
gemfile: gemfiles/Gemfile.rails-3.2-stable

- rvm: 2.1.10
gemfile: Gemfile
- rvm: 2.4.1
gemfile: gemfiles/Gemfile.rails-4.1-stable
- rvm: ruby-head
gemfile: gemfiles/Gemfile.rails-4.1-stable
- rvm: 2.1.10
gemfile: gemfiles/Gemfile.rails-5.0-stable
- rvm: 2.1.10
gemfile: Gemfile
- env: DEVISE_ORM=mongoid
gemfile: Gemfile
- env: DEVISE_ORM=mongoid
gemfile: gemfiles/Gemfile.rails-5.0-stable
allow_failures:
- rvm: ruby-head
services:
- mongodb

@@ -27,18 +40,19 @@ cache: bundler

env:
matrix:
- DEVISE_ORM=mongoid
- DEVISE_ORM=active_record
- DEVISE_ORM=mongoid

before_install: "rm ${BUNDLE_GEMFILE}.lock"

before_script: "bundle update"

script: "bundle exec rake test"
script: "bin/test"

notifications:
email: false
slack:
on_pull_requests: false
on_success: change
on_failure: always
secure: Q3M+kmude3FjisibEeeGe0wSMXgvwLH+vL7Zrx9//q4QtkfnrQ/BBMvY9KXxPEsNF+eys4YopYjTkJ8uRmeboUATW/oQ4Jrv3+u3zkIHK2sFn/Q2cQWpK5w+CbgEnHPjKYnUu34b09njXTgDlr/mqtbPqrKeZ1dLlpKXCB/q4GY=
Loading