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
ab43e9c1
Commit
ab43e9c1
authored
Apr 17, 2016
by
Elan Ruusamäe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update gitlab shell secret file also when it is empty
parent
6b88cc64
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/backend/shell.rb
lib/gitlab/backend/shell.rb
+1
-1
No files found.
CHANGELOG
View file @
ab43e9c1
...
@@ -8,6 +8,7 @@ v 8.12.0 (unreleased)
...
@@ -8,6 +8,7 @@ v 8.12.0 (unreleased)
- Prune events older than 12 months. (ritave)
- Prune events older than 12 months. (ritave)
- Prepend blank line to `Closes` message on merge request linked to issue (lukehowell)
- Prepend blank line to `Closes` message on merge request linked to issue (lukehowell)
- Filter tags by name !6121
- Filter tags by name !6121
- Update gitlab shell secret file also when it is empty. !3774 (glensc)
- Give project selection dropdowns responsive width, make non-wrapping.
- Give project selection dropdowns responsive width, make non-wrapping.
- Make push events have equal vertical spacing.
- Make push events have equal vertical spacing.
- Add two-factor recovery endpoint to internal API !5510
- Add two-factor recovery endpoint to internal API !5510
...
...
lib/gitlab/backend/shell.rb
View file @
ab43e9c1
...
@@ -195,7 +195,7 @@ module Gitlab
...
@@ -195,7 +195,7 @@ module Gitlab
# Create (if necessary) and link the secret token file
# Create (if necessary) and link the secret token file
def
generate_and_link_secret_token
def
generate_and_link_secret_token
secret_file
=
Gitlab
.
config
.
gitlab_shell
.
secret_file
secret_file
=
Gitlab
.
config
.
gitlab_shell
.
secret_file
unless
File
.
exist?
secret_file
unless
File
.
size?
(
secret_file
)
# Generate a new token of 16 random hexadecimal characters and store it in secret_file.
# Generate a new token of 16 random hexadecimal characters and store it in secret_file.
token
=
SecureRandom
.
hex
(
16
)
token
=
SecureRandom
.
hex
(
16
)
File
.
write
(
secret_file
,
token
)
File
.
write
(
secret_file
,
token
)
...
...
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