summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-09 14:59:07 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-11 12:22:57 +0300
commit6743147b7d9f310fbf5afa520e19ae495fd4df33 (patch)
tree2ac26c5fd33ea635462d73b8925915dff8486694 /app/controllers/application_controller.rb
parente02efff63d2b065f95e4eeac28ba994d245e4505 (diff)
downloadgitlab-ce-6743147b7d9f310fbf5afa520e19ae495fd4df33.tar.gz
Improve manifest feature after backend review
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 07089ada51d..f45fcd4d900 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -358,7 +358,7 @@ class ApplicationController < ActionController::Base
end
def manifest_import_enabled?
- Gitlab::CurrentSettings.import_sources.include?('manifest')
+ Group.supports_nested_groups? && Gitlab::CurrentSettings.import_sources.include?('manifest')
end
# U2F (universal 2nd factor) devices need a unique identifier for the application