Merge branch 'ruby-19-hash' into 'master'

Ruby 1.9 hash

See merge request !1430

app/controllers/passwords_controller.rb

@@ -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

app/controllers/projects/protected_branches_controller.rb

@@ -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|