summaryrefslogtreecommitdiff
path: root/lib/gitlab/github_import
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-01-22 00:11:19 +0000
committerRémy Coutable <remy@rymai.me>2017-01-23 16:35:24 +0100
commit632c2939bb1e9d10b5e9be05bc4692d92f9f5f32 (patch)
treeb56bf9a5fb3665fc38cdf5fa0b1e5739983a3bdb /lib/gitlab/github_import
parent6c65f7a7ce52fadcf53ea2395103de32b0107874 (diff)
downloadgitlab-ce-632c2939bb1e9d10b5e9be05bc4692d92f9f5f32.tar.gz
Revert "Merge branch 'revert-9cac0317' into 'master' "
This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
Diffstat (limited to 'lib/gitlab/github_import')
-rw-r--r--lib/gitlab/github_import/project_creator.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/github_import/project_creator.rb b/lib/gitlab/github_import/project_creator.rb
index 3f635be22ba..a55adc9b1c8 100644
--- a/lib/gitlab/github_import/project_creator.rb
+++ b/lib/gitlab/github_import/project_creator.rb
@@ -1,6 +1,8 @@
module Gitlab
module GithubImport
class ProjectCreator
+ include Gitlab::CurrentSettings
+
attr_reader :repo, :name, :namespace, :current_user, :session_data, :type
def initialize(repo, name, namespace, current_user, session_data, type: 'github')
@@ -34,7 +36,7 @@ module Gitlab
end
def visibility_level
- repo.private ? Gitlab::VisibilityLevel::PRIVATE : ApplicationSetting.current.default_project_visibility
+ repo.private ? Gitlab::VisibilityLevel::PRIVATE : current_application_settings.default_project_visibility
end
#