Skip to content
Snippets Groups Projects
Commit 3dfcb95f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Use ruby 1.9 hash syntax

parent 630ff574
No related branches found
No related tags found
1 merge request!8686add "Uplaod" and "Replace" functionality
Loading
Loading
@@ -5,12 +5,12 @@ class PasswordsController < Devise::PasswordsController
resource_found = resource_class.find_by_email(email)
if resource_found && resource_found.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
 
self.resource = resource_class.send_reset_password_instructions(resource_params)
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
respond_with(resource)
end
Loading
Loading
Loading
Loading
@@ -24,7 +24,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
)
 
respond_to do |format|
format.json { render :json => protected_branch, status: :ok }
format.json { render json: protected_branch, status: :ok }
end
else
respond_to do |format|
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment