Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
2bb8e93d
Commit
2bb8e93d
authored
Nov 07, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8246 from dluchinienoc/master
Do not require immediate password reset if specifying a password
parents
9a2afa00
019c0f9e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
db/fixtures/production/001_admin.rb
db/fixtures/production/001_admin.rb
+8
-6
No files found.
db/fixtures/production/001_admin.rb
View file @
2bb8e93d
password
=
if
ENV
[
'GITLAB_ROOT_PASSWORD'
].
blank?
"5iveL!fe"
else
ENV
[
'GITLAB_ROOT_PASSWORD'
]
end
if
ENV
[
'GITLAB_ROOT_PASSWORD'
].
blank?
password
=
'5iveL!fe'
expire_time
=
Time
.
now
else
password
=
ENV
[
'GITLAB_ROOT_PASSWORD'
]
expire_time
=
nil
end
admin
=
User
.
create
(
email:
"admin@example.com"
,
...
...
@@ -10,7 +12,7 @@ admin = User.create(
username:
'root'
,
password:
password
,
password_confirmation:
password
,
password_expires_at:
Time
.
now
,
password_expires_at:
expire_time
,
theme_id:
Gitlab
::
Theme
::
MARS
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment