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
30209fc4
Commit
30209fc4
authored
Sep 01, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Gitlab::CurrentSettings available when getting settings
parent
fbdbc0ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/concerns/elastic/application_search.rb
app/models/concerns/elastic/application_search.rb
+1
-1
lib/gitlab/shell.rb
lib/gitlab/shell.rb
+2
-2
No files found.
app/models/concerns/elastic/application_search.rb
View file @
30209fc4
module
Elastic
module
ApplicationSearch
extend
ActiveSupport
::
Concern
extend
Gitlab
::
CurrentSettings
included
do
include
Elasticsearch
::
Model
extend
Gitlab
::
CurrentSettings
index_name
[
Rails
.
application
.
class
.
parent_name
.
downcase
,
Rails
.
env
].
join
(
'-'
)
...
...
lib/gitlab/shell.rb
View file @
30209fc4
...
...
@@ -442,9 +442,9 @@ module Gitlab
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?
return
true
if
Gitlab
::
CurrentSettings
.
current_application_settings
.
authorized_keys_enabled
.
nil?
current_application_settings
.
authorized_keys_enabled
Gitlab
::
CurrentSettings
.
current_application_settings
.
authorized_keys_enabled
end
private
...
...
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