From 69e1f7e8c6738ca3565bcbe2e2b5e25522f7bc35 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 24 Feb 2017 15:02:58 +0100
Subject: [PATCH] Fixed typo.

---
 app/controllers/tickets_controller.rb | 6 +++---
 app/models/user.rb                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
index cda95e56e..1fb239e73 100644
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -324,7 +324,7 @@ class TicketsController < ApplicationController
     ticket_master = Ticket.find_by(number: params[:master_ticket_number])
     if !ticket_master
       render json: {
-        result: 'faild',
+        result: 'failed',
         message: 'No such master ticket number!',
       }
       return
@@ -337,7 +337,7 @@ class TicketsController < ApplicationController
     ticket_slave = Ticket.find_by(id: params[:slave_ticket_id])
     if !ticket_slave
       render json: {
-        result: 'faild',
+        result: 'failed',
         message: 'No such slave ticket!',
       }
       return
@@ -349,7 +349,7 @@ class TicketsController < ApplicationController
     # check diffetent ticket ids
     if ticket_slave.id == ticket_master.id
       render json: {
-        result: 'faild',
+        result: 'failed',
         message: 'Can\'t merge ticket with it self!',
       }
       return
diff --git a/app/models/user.rb b/app/models/user.rb
index 02b266ddb..925afcb69 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -227,7 +227,7 @@ returns
     # check failed logins
     max_login_failed = Setting.get('password_max_login_failed').to_i || 10
     if user && user.login_failed > max_login_failed
-      logger.info "Max login faild reached for user #{user.login}."
+      logger.info "Max login failed reached for user #{user.login}."
       return false
     end