summaryrefslogtreecommitdiff
path: root/app/controllers/import
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-06 15:06:44 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-11 12:22:57 +0300
commit85b0240c4b58a49b22c9dbff9451127ae817652a (patch)
tree1674729902e2c8a9041134e0ed581ad4c96d958a /app/controllers/import
parent4cee5d2e8c78001a1affc53175833641253adbb0 (diff)
downloadgitlab-ce-85b0240c4b58a49b22c9dbff9451127ae817652a.tar.gz
Add feature specs for manifest import
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/import')
-rw-r--r--app/controllers/import/manifest_controller.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/import/manifest_controller.rb b/app/controllers/import/manifest_controller.rb
index 1af686bfa83..0be9cc2468f 100644
--- a/app/controllers/import/manifest_controller.rb
+++ b/app/controllers/import/manifest_controller.rb
@@ -1,4 +1,5 @@
class Import::ManifestController < Import::BaseController
+ before_action :whitelist_query_limiting, only: [:create]
before_action :verify_import_enabled
before_action :ensure_import_vars, only: [:create, :status]
@@ -85,4 +86,8 @@ class Import::ManifestController < Import::BaseController
def verify_import_enabled
render_404 unless manifest_import_enabled?
end
+
+ def whitelist_query_limiting
+ Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/48939')
+ end
end