Merge pull request #5072 from jbornschein/proj-new-public

Add "public-project?" checkbox to new-project view 

3 files changed, 14 insertions, 8 deletions

diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 9c079bbb9ff..f2707f62378 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -36,6 +36,12 @@
   }
 }
 
+.project-public-holder {
+  .help-inline {
+    padding-top: 7px;
+  }
+}
+
 .save-project-loader {
   img {
     margin-top: 50px;
diff --git a/app/contexts/projects/create_context.rb b/app/contexts/projects/create_context.rb
index 9fd24e0eeea..1c60a5de141 100644
--- a/app/contexts/projects/create_context.rb
+++ b/app/contexts/projects/create_context.rb
@@ -18,7 +18,7 @@ module Projects
         snippets_enabled: default_features.snippets,
         merge_requests_enabled: default_features.merge_requests,
         public: default_features.public
-      }
+      }.stringify_keys
 
       @project = Project.new(default_opts.merge(params))
 
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index ab8efe5e3e1..0213576927b 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -2,13 +2,7 @@
   .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
+
     = form_for @project, remote: true do |f|
       .control-group.project-name-holder
         = f.label :name do
@@ -53,6 +47,12 @@
           %span.light (optional)
         .controls
           = f.text_area :description, placeholder: "awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3
+      .control-group.project-public-holder
+        = f.label :public do
+          %span Public project
+        .controls
+          = f.check_box :public, { checked: Gitlab.config.gitlab.default_projects_features.public }, true, false
+          %span.help-inline Make project visible to everyone
 
       .form-actions
         = f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4