Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 4 deletions

diff --git a/app/assets/javascripts/lib/utils/http_status.js b/app/assets/javascripts/lib/utils/http_status.js
index 678ebc35565..61c2ecfecd9 100644
--- a/app/assets/javascripts/lib/utils/http_status.js
+++ b/app/assets/javascripts/lib/utils/http_status.js
@@ -9,16 +9,17 @@ export const HTTP_STATUS_PARTIAL_CONTENT = 206;
 export const HTTP_STATUS_MULTI_STATUS = 207;
 export const HTTP_STATUS_ALREADY_REPORTED = 208;
 export const HTTP_STATUS_IM_USED = 226;
+export const HTTP_STATUS_BAD_REQUEST = 400;
+export const HTTP_STATUS_UNAUTHORIZED = 401;
+export const HTTP_STATUS_FORBIDDEN = 403;
+export const HTTP_STATUS_NOT_FOUND = 404;
 export const HTTP_STATUS_METHOD_NOT_ALLOWED = 405;
 export const HTTP_STATUS_CONFLICT = 409;
 export const HTTP_STATUS_GONE = 410;
 export const HTTP_STATUS_PAYLOAD_TOO_LARGE = 413;
+export const HTTP_STATUS_IM_A_TEAPOT = 418;
 export const HTTP_STATUS_UNPROCESSABLE_ENTITY = 422;
 export const HTTP_STATUS_TOO_MANY_REQUESTS = 429;
-export const HTTP_STATUS_BAD_REQUEST = 400;
-export const HTTP_STATUS_UNAUTHORIZED = 401;
-export const HTTP_STATUS_FORBIDDEN = 403;
-export const HTTP_STATUS_NOT_FOUND = 404;
 export const HTTP_STATUS_INTERNAL_SERVER_ERROR = 500;
 export const HTTP_STATUS_SERVICE_UNAVAILABLE = 503;