From 44b819833407b81fd97873bebffc939c23294595 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <marin@gitlab.com>
Date: Tue, 15 Jul 2014 14:30:05 +0200
Subject: [PATCH] Do not set password expiry.
---
app/controllers/admin/users_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 1432fff8821..b22a1c033ce 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -39,7 +39,7 @@ class Admin::UsersController < Admin::ApplicationController
def create
opts = {
force_random_password: true,
- password_expires_at: Time.now
+ password_expires_at: nil
}
@user = User.new(user_params.merge(opts))
--
GitLab