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
9b54c1c7
Commit
9b54c1c7
authored
Sep 04, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix more Gitlab::CurrentSettings.current_application_settings
parent
a7427f7b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
app/services/slash_commands/global_slack_handler.rb
app/services/slash_commands/global_slack_handler.rb
+2
-1
ee/app/models/ee/project/import_status_state_machine.rb
ee/app/models/ee/project/import_status_state_machine.rb
+1
-1
ee/app/policies/ee/group_policy.rb
ee/app/policies/ee/group_policy.rb
+2
-1
ee/app/workers/ee/post_receive.rb
ee/app/workers/ee/post_receive.rb
+2
-2
No files found.
app/services/slash_commands/global_slack_handler.rb
View file @
9b54c1c7
...
...
@@ -36,7 +36,8 @@ module SlashCommands
def
valid_token?
ActiveSupport
::
SecurityUtils
.
variable_size_secure_compare
(
current_application_settings
.
slack_app_verification_token
,
Gitlab
::
CurrentSettings
.
current_application_settings
.
slack_app_verification_token
,
params
[
:token
]
)
end
...
...
ee/app/models/ee/project/import_status_state_machine.rb
View file @
9b54c1c7
...
...
@@ -46,7 +46,7 @@ module EE
mirror_data
.
set_next_execution_timestamp!
end
if
current_application_settings
.
elasticsearch_indexing?
if
::
Gitlab
::
CurrentSettings
.
current_application_settings
.
elasticsearch_indexing?
project
.
run_after_commit
do
last_indexed_commit
=
project
.
index_status
&
.
last_commit
ElasticCommitIndexerWorker
.
perform_async
(
project
.
id
,
last_indexed_commit
)
...
...
ee/app/policies/ee/group_policy.rb
View file @
9b54c1c7
...
...
@@ -7,7 +7,8 @@ module EE
condition
(
:ldap_synced
)
{
@subject
.
ldap_synced?
}
condition
(
:can_owners_manage_ldap
,
scope: :global
)
do
current_application_settings
.
allow_group_owners_to_manage_ldap
::
Gitlab
::
CurrentSettings
.
current_application_settings
.
allow_group_owners_to_manage_ldap
end
rule
{
auditor
}.
enable
:read_group
...
...
ee/app/workers/ee/post_receive.rb
View file @
9b54c1c7
...
...
@@ -5,7 +5,6 @@ module EE
# and be prepended in the `PostReceive` worker
module
PostReceive
extend
ActiveSupport
::
Concern
extend
::
Gitlab
::
CurrentSettings
private
...
...
@@ -28,7 +27,8 @@ module EE
end
def
update_wiki_es_indexes
(
post_received
)
return
unless
current_application_settings
.
elasticsearch_indexing?
return
unless
::
Gitlab
::
CurrentSettings
.
current_application_settings
.
elasticsearch_indexing?
post_received
.
project
.
wiki
.
index_blobs
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