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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
01319e59
Commit
01319e59
authored
Sep 01, 2017
by
Sean McGivern
Committed by
James Edwards-Jones
Jan 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Gitlab::CurrentSettings available when getting settings
parent
d2f4e8f9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
lib/gitlab/shell.rb
lib/gitlab/shell.rb
+8
-8
No files found.
lib/gitlab/shell.rb
View file @
01319e59
...
@@ -391,6 +391,14 @@ module Gitlab
...
@@ -391,6 +391,14 @@ module Gitlab
File
.
join
(
gitlab_shell_path
,
'bin'
,
'gitlab-keys'
)
File
.
join
(
gitlab_shell_path
,
'bin'
,
'gitlab-keys'
)
end
end
def
authorized_keys_enabled?
# Return true if nil to ensure the authorized_keys methods work while
# fixing the authorized_keys file during migration.
return
true
if
Gitlab
::
CurrentSettings
.
current_application_settings
.
authorized_keys_enabled
.
nil?
Gitlab
::
CurrentSettings
.
current_application_settings
.
authorized_keys_enabled
end
private
private
def
gitlab_projects
(
shard_path
,
disk_path
)
def
gitlab_projects
(
shard_path
,
disk_path
)
...
@@ -468,13 +476,5 @@ module Gitlab
...
@@ -468,13 +476,5 @@ module Gitlab
# need to do the same here...
# need to do the same here...
raise
Error
,
e
raise
Error
,
e
end
end
def
authorized_keys_enabled?
# Return true if nil to ensure the authorized_keys methods work while
# fixing the authorized_keys file during migration.
return
true
if
current_application_settings
.
authorized_keys_enabled
.
nil?
current_application_settings
.
authorized_keys_enabled
end
end
end
end
end
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