diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 886bd24f..97a936b1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ ### Please read before contributing -1) Do not post questions in the issues tracker. If you have any questions about Devise, search the [Wiki](https://github.com/plataformatec/devise/wiki) or use the [Mailing List](https://groups.google.com/group/plataformatec-devise) or [Stack Overflow](http://stackoverflow.com/questions/tagged/devise). +1) Do not post questions in the issues tracker. If you have any questions about Devise, search the [Wiki](https://github.com/plataformatec/devise/wiki) or use the [Mailing List](https://groups.google.com/group/plataformatec-devise) or [Stack Overflow](http://stackoverflow.com/questions/tagged/devise). 2) If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to [developers@plataformatec.com.br](mailto:developers@plataformatec.com.br) instead. diff --git a/lib/devise/controllers/scoped_views.rb b/lib/devise/controllers/scoped_views.rb index 7865b786..7ba965e5 100644 --- a/lib/devise/controllers/scoped_views.rb +++ b/lib/devise/controllers/scoped_views.rb @@ -14,4 +14,4 @@ module Devise end end end -end \ No newline at end of file +end diff --git a/lib/devise/controllers/sign_in_out.rb b/lib/devise/controllers/sign_in_out.rb index 78585387..205a1e6e 100644 --- a/lib/devise/controllers/sign_in_out.rb +++ b/lib/devise/controllers/sign_in_out.rb @@ -100,4 +100,4 @@ module Devise end end end -end \ No newline at end of file +end diff --git a/lib/devise/hooks/activatable.rb b/lib/devise/hooks/activatable.rb index bca071ce..af32e2b0 100644 --- a/lib/devise/hooks/activatable.rb +++ b/lib/devise/hooks/activatable.rb @@ -8,4 +8,4 @@ Warden::Manager.after_set_user do |record, warden, options| warden.logout(scope) throw :warden, :scope => scope, :message => record.inactive_message end -end \ No newline at end of file +end diff --git a/lib/devise/hooks/proxy.rb b/lib/devise/hooks/proxy.rb index b97c7f61..096f624a 100644 --- a/lib/devise/hooks/proxy.rb +++ b/lib/devise/hooks/proxy.rb @@ -18,4 +18,4 @@ module Devise end end end -end \ No newline at end of file +end diff --git a/lib/devise/hooks/rememberable.rb b/lib/devise/hooks/rememberable.rb index 0dc19bbd..f67e05d4 100644 --- a/lib/devise/hooks/rememberable.rb +++ b/lib/devise/hooks/rememberable.rb @@ -4,4 +4,4 @@ Warden::Manager.after_set_user :except => :fetch do |record, warden, options| record.remember_me && warden.authenticated?(scope) Devise::Hooks::Proxy.new(warden).remember_me(record) end -end \ No newline at end of file +end diff --git a/lib/devise/modules.rb b/lib/devise/modules.rb index a93b4b03..b7cdc2f6 100644 --- a/lib/devise/modules.rb +++ b/lib/devise/modules.rb @@ -25,4 +25,4 @@ Devise.with_options :model => true do |d| # Stats for last, so we make sure the user is really signed in d.add_module :trackable -end \ No newline at end of file +end diff --git a/lib/devise/orm/active_record.rb b/lib/devise/orm/active_record.rb index 52343d4f..0935cdaa 100644 --- a/lib/devise/orm/active_record.rb +++ b/lib/devise/orm/active_record.rb @@ -1,3 +1,3 @@ require 'orm_adapter/adapters/active_record' -ActiveRecord::Base.extend Devise::Models \ No newline at end of file +ActiveRecord::Base.extend Devise::Models diff --git a/lib/devise/orm/mongoid.rb b/lib/devise/orm/mongoid.rb index 858a9156..31a0736d 100644 --- a/lib/devise/orm/mongoid.rb +++ b/lib/devise/orm/mongoid.rb @@ -1,3 +1,3 @@ require 'orm_adapter/adapters/mongoid' -Mongoid::Document::ClassMethods.send :include, Devise::Models \ No newline at end of file +Mongoid::Document::ClassMethods.send :include, Devise::Models diff --git a/lib/devise/strategies/base.rb b/lib/devise/strategies/base.rb index 6f182113..ee5c8c7f 100644 --- a/lib/devise/strategies/base.rb +++ b/lib/devise/strategies/base.rb @@ -17,4 +17,4 @@ module Devise end end end -end \ No newline at end of file +end diff --git a/lib/devise/time_inflector.rb b/lib/devise/time_inflector.rb index 5d09ce80..cb311883 100644 --- a/lib/devise/time_inflector.rb +++ b/lib/devise/time_inflector.rb @@ -11,4 +11,4 @@ module Devise @instance = new end -end \ No newline at end of file +end diff --git a/lib/generators/templates/README b/lib/generators/templates/README index 76235244..f50fbb78 100644 --- a/lib/generators/templates/README +++ b/lib/generators/templates/README @@ -2,8 +2,8 @@ Some setup you must do manually if you haven't yet: - 1. Ensure you have defined default url options in your environments files. Here - is an example of default_url_options appropriate for a development environment + 1. Ensure you have defined default url options in your environments files. Here + is an example of default_url_options appropriate for a development environment in config/environments/development.rb: config.action_mailer.default_url_options = { :host => 'localhost:3000' } diff --git a/test/generators/mongoid_generator_test.rb b/test/generators/mongoid_generator_test.rb index 23029568..1d0a1b26 100644 --- a/test/generators/mongoid_generator_test.rb +++ b/test/generators/mongoid_generator_test.rb @@ -7,12 +7,12 @@ if DEVISE_ORM == :mongoid tests Mongoid::Generators::DeviseGenerator destination File.expand_path("../../tmp", __FILE__) setup :prepare_destination - + test "all files are properly created" do run_generator %w(monster) assert_file "app/models/monster.rb", /devise/ end - + test "all files are properly deleted" do run_generator %w(monster) run_generator %w(monster), :behavior => :revoke diff --git a/test/mapping_test.rb b/test/mapping_test.rb index 1617d271..2ec97e19 100644 --- a/test/mapping_test.rb +++ b/test/mapping_test.rb @@ -110,12 +110,12 @@ class MappingTest < ActiveSupport::TestCase assert mapping.lockable? assert_not mapping.omniauthable? end - + test 'find mapping by path' do assert_raise RuntimeError do Devise::Mapping.find_by_path!('/accounts/facebook/callback') end - + assert_nothing_raised do Devise::Mapping.find_by_path!('/:locale/accounts/login') end @@ -123,5 +123,5 @@ class MappingTest < ActiveSupport::TestCase assert_nothing_raised do Devise::Mapping.find_by_path!('/accounts/facebook/callback', :path) end - end + end end diff --git a/test/models/recoverable_test.rb b/test/models/recoverable_test.rb index fa3b1c63..f6afc20c 100644 --- a/test/models/recoverable_test.rb +++ b/test/models/recoverable_test.rb @@ -180,5 +180,5 @@ class RecoverableTest < ActiveSupport::TestCase :reset_password_sent_at, :reset_password_token ] - end + end end diff --git a/test/omniauth/config_test.rb b/test/omniauth/config_test.rb index 3de56c35..f53a5d73 100644 --- a/test/omniauth/config_test.rb +++ b/test/omniauth/config_test.rb @@ -54,4 +54,4 @@ class OmniAuthConfigTest < ActiveSupport::TestCase config_class = config.strategy_class assert_equal MyStrategy, config_class end -end \ No newline at end of file +end diff --git a/test/rails_app/app/active_record/shim.rb b/test/rails_app/app/active_record/shim.rb index f12053eb..66f12cdb 100644 --- a/test/rails_app/app/active_record/shim.rb +++ b/test/rails_app/app/active_record/shim.rb @@ -1,2 +1,2 @@ module Shim -end \ No newline at end of file +end diff --git a/test/rails_app/app/controllers/admins/sessions_controller.rb b/test/rails_app/app/controllers/admins/sessions_controller.rb index 1c1b0b8e..525ca5ef 100644 --- a/test/rails_app/app/controllers/admins/sessions_controller.rb +++ b/test/rails_app/app/controllers/admins/sessions_controller.rb @@ -3,4 +3,4 @@ class Admins::SessionsController < Devise::SessionsController flash[:special] = "Welcome to #{controller_path.inspect} controller!" super end -end \ No newline at end of file +end diff --git a/test/rails_app/app/controllers/publisher/registrations_controller.rb b/test/rails_app/app/controllers/publisher/registrations_controller.rb index daf5e7fa..7809a363 100644 --- a/test/rails_app/app/controllers/publisher/registrations_controller.rb +++ b/test/rails_app/app/controllers/publisher/registrations_controller.rb @@ -1,2 +1,2 @@ class Publisher::RegistrationsController < ApplicationController -end \ No newline at end of file +end diff --git a/test/rails_app/app/controllers/publisher/sessions_controller.rb b/test/rails_app/app/controllers/publisher/sessions_controller.rb index 03e106d7..2eed1bb0 100644 --- a/test/rails_app/app/controllers/publisher/sessions_controller.rb +++ b/test/rails_app/app/controllers/publisher/sessions_controller.rb @@ -1,2 +1,2 @@ class Publisher::SessionsController < ApplicationController -end \ No newline at end of file +end diff --git a/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb b/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb index 71eb57ec..0ee486e7 100644 --- a/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +++ b/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb @@ -11,4 +11,4 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController sign_in user render :text => "" end -end \ No newline at end of file +end diff --git a/test/rails_app/app/views/admins/sessions/new.html.erb b/test/rails_app/app/views/admins/sessions/new.html.erb index c3f29d2b..b9953b17 100644 --- a/test/rails_app/app/views/admins/sessions/new.html.erb +++ b/test/rails_app/app/views/admins/sessions/new.html.erb @@ -1,2 +1,2 @@ Welcome to "sessions/new" view! -<%= render :file => "devise/sessions/new" %> \ No newline at end of file +<%= render :file => "devise/sessions/new" %> diff --git a/test/rails_app/app/views/home/admin_dashboard.html.erb b/test/rails_app/app/views/home/admin_dashboard.html.erb index ad6e2462..382c9968 100644 --- a/test/rails_app/app/views/home/admin_dashboard.html.erb +++ b/test/rails_app/app/views/home/admin_dashboard.html.erb @@ -1 +1 @@ -Admin dashboard \ No newline at end of file +Admin dashboard diff --git a/test/rails_app/app/views/home/index.html.erb b/test/rails_app/app/views/home/index.html.erb index 7272a5af..c3942a09 100644 --- a/test/rails_app/app/views/home/index.html.erb +++ b/test/rails_app/app/views/home/index.html.erb @@ -1 +1 @@ -Home! \ No newline at end of file +Home! diff --git a/test/rails_app/app/views/home/join.html.erb b/test/rails_app/app/views/home/join.html.erb index a8d9133d..e3bafea5 100644 --- a/test/rails_app/app/views/home/join.html.erb +++ b/test/rails_app/app/views/home/join.html.erb @@ -1 +1 @@ -Join \ No newline at end of file +Join diff --git a/test/rails_app/app/views/home/user_dashboard.html.erb b/test/rails_app/app/views/home/user_dashboard.html.erb index a54dcabf..578ba45a 100644 --- a/test/rails_app/app/views/home/user_dashboard.html.erb +++ b/test/rails_app/app/views/home/user_dashboard.html.erb @@ -1 +1 @@ -User dashboard \ No newline at end of file +User dashboard