Commit 3dfcb95f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use ruby 1.9 hash syntax

parent 630ff574
...@@ -5,12 +5,12 @@ class PasswordsController < Devise::PasswordsController ...@@ -5,12 +5,12 @@ class PasswordsController < Devise::PasswordsController
resource_found = resource_class.find_by_email(email) resource_found = resource_class.find_by_email(email)
if resource_found && resource_found.ldap_user? if resource_found && resource_found.ldap_user?
flash[:alert] = "Cannot reset password for LDAP user." flash[:alert] = "Cannot reset password for LDAP user."
respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name)) and return respond_with({}, location: after_sending_reset_password_instructions_path_for(resource_name)) and return
end end
self.resource = resource_class.send_reset_password_instructions(resource_params) self.resource = resource_class.send_reset_password_instructions(resource_params)
if successfully_sent?(resource) if successfully_sent?(resource)
respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name)) respond_with({}, location: after_sending_reset_password_instructions_path_for(resource_name))
else else
respond_with(resource) respond_with(resource)
end end
......
...@@ -24,7 +24,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController ...@@ -24,7 +24,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
) )
respond_to do |format| respond_to do |format|
format.json { render :json => protected_branch, status: :ok } format.json { render json: protected_branch, status: :ok }
end end
else else
respond_to do |format| respond_to do |format|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment