Merge pull request #5022 from amacarthur/config-public-project

make public/private setting for project creation configurable

app/contexts/projects/create_context.rb

@@ -16,7 +16,8 @@ module Projects
         wiki_enabled: default_features.wiki,
         wall_enabled: default_features.wall,
         snippets_enabled: default_features.snippets,
-        merge_requests_enabled: default_features.merge_requests
+        merge_requests_enabled: default_features.merge_requests,
+        public: default_features.public
       }
 
       @project = Project.new(default_opts.merge(params))

app/views/projects/new.html.haml

@@ -2,6 +2,10 @@
   .project-edit-errors
     = render 'projects/errors'
   .project-edit-content
+    - if Gitlab.config.gitlab.default_projects_features.public
+      %p.slead
+        New projects are public by default. Any signed in user can see your project but cannot commit to it unless granted access.
+    - else
       %p.slead
         New projects are private by default. You choose who can see the project and commit to repository.
     %hr

config/gitlab.yml.example

@@ -58,6 +58,7 @@ production: &base
       wiki: true
       wall: false
       snippets: false
+      public: false
 
   ## External issues trackers
   issues_tracker:

config/initializers/1_settings.rb

@@ -75,6 +75,7 @@ Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.g
 Settings.gitlab.default_projects_features['wiki']           = true if Settings.gitlab.default_projects_features['wiki'].nil?
 Settings.gitlab.default_projects_features['wall']           = false if Settings.gitlab.default_projects_features['wall'].nil?
 Settings.gitlab.default_projects_features['snippets']       = false if Settings.gitlab.default_projects_features['snippets'].nil?
+Settings.gitlab.default_projects_features['public']         = false if Settings.gitlab.default_projects_features['public'].nil?
 
 #
 # Gravatar

spec/contexts/projects_create_context_spec.rb

@@ -30,6 +30,37 @@ describe Projects::CreateContext do
       it { @project.owner.should == @user }
       it { @project.namespace.should == @group }
     end
+
+    context 'respect configured public setting' do
+      before(:each) do
+        @settings = double("settings")
+        @settings.stub(:issues) { true }
+        @settings.stub(:merge_requests) { true }
+        @settings.stub(:wiki) { true }
+        @settings.stub(:wall) { true }
+        @settings.stub(:snippets) { true }
+        stub_const("Settings", Class.new)
+        Settings.stub_chain(:gitlab, :default_projects_features).and_return(@settings)
+      end
+
+      context 'should be public when setting is public' do
+        before do
+          @settings.stub(:public) { true }
+          @project = create_project(@user, @opts)
+        end
+
+        it { @project.public.should be_true }
+      end
+
+      context 'should be private when setting is not public' do
+        before do
+          @settings.stub(:public) { false }
+          @project = create_project(@user, @opts)
+        end
+
+        it { @project.public.should be_false }
+      end
+    end
   end
 
   def create_project(user, opts)