From 8199be83f5975cd6ac1afd964ebba2963186d71b Mon Sep 17 00:00:00 2001 From: Joerg Bornschein Date: Fri, 13 Sep 2013 13:02:37 +0200 Subject: [PATCH 1/3] Fix default settings when creating new Project --- app/contexts/projects/create_context.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- GitLab From 83b212a4ef942ec34096c2d194f8dd827ef4eb8b Mon Sep 17 00:00:00 2001 From: Joerg Bornschein Date: Fri, 13 Sep 2013 14:39:04 +0200 Subject: [PATCH 2/3] Add public-project? checkbox to new-project view --- app/assets/stylesheets/sections/projects.scss | 6 ++++++ app/views/projects/new.html.haml | 14 +++++++------- 2 files changed, 13 insertions(+), 7 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/views/projects/new.html.haml b/app/views/projects/new.html.haml index ab8efe5e3e1..9055c04b7fb 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 -- GitLab From c71460d2d3c6b868da099f090af812e15d552bb9 Mon Sep 17 00:00:00 2001 From: Joerg Bornschein Date: Sat, 14 Sep 2013 13:28:15 +0200 Subject: [PATCH 3/3] Use ruby 1.9 hash syntax --- app/views/projects/new.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 9055c04b7fb..0213576927b 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -51,7 +51,7 @@ = f.label :public do %span Public project .controls - = f.check_box :public, { :checked => Gitlab.config.gitlab.default_projects_features.public }, true, false + = f.check_box :public, { checked: Gitlab.config.gitlab.default_projects_features.public }, true, false %span.help-inline Make project visible to everyone .form-actions -- GitLab