diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-01-22 01:55:35 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-01-22 01:55:35 +0300 |
| commit | baeaa97ef49558a303b0bd7b6cc9ce4ccfc13d1d (patch) | |
| tree | c009601bc21af2f88f0d246427d5fbe3db5e5bb2 /lib/gitlab/github_import | |
| parent | f6f52b43b59641f5e0c6f7aa47b1354ca3aeee32 (diff) | |
Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'"
This reverts merge request !8573
Diffstat (limited to 'lib/gitlab/github_import')
| -rw-r--r-- | lib/gitlab/github_import/project_creator.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/github_import/project_creator.rb b/lib/gitlab/github_import/project_creator.rb index a55adc9b1c8..3f635be22ba 100644 --- a/lib/gitlab/github_import/project_creator.rb +++ b/lib/gitlab/github_import/project_creator.rb @@ -1,8 +1,6 @@ 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') @@ -36,7 +34,7 @@ module Gitlab end def visibility_level - repo.private ? Gitlab::VisibilityLevel::PRIVATE : current_application_settings.default_project_visibility + repo.private ? Gitlab::VisibilityLevel::PRIVATE : ApplicationSetting.current.default_project_visibility end # |