diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml index 84cd030ec0913bc26b910a3897ccfefed74bddb0..eeb6ba8b15cc63e5cb30e28c930ea06d7e2339fa 100644 --- a/app/views/admin/projects/_form.html.haml +++ b/app/views/admin/projects/_form.html.haml @@ -4,10 +4,9 @@ %ul - @admin_project.errors.full_messages.each do |msg| %li= msg - .clearfix = f.label :name - .input= f.text_field :name + .input= f.text_field :name, :placeholder => "Example Project" .clearfix = f.label :path do Path @@ -23,7 +22,7 @@ %span.add-on= web_app_url = f.text_field :code, :placeholder => "example" - - unless @admin_project.new_record? + - unless @admin_project.new_record? || @admin_project.heads.empty? .clearfix = f.label :owner_id .input= f.select :owner_id, User.all.map { |user| [user.name, user.id] } @@ -48,19 +47,19 @@ = f.label :wall_enabled, "Wall" .input= f.check_box :wall_enabled + .clearfix + = f.label :wiki_enabled, "Wiki" + .input= f.check_box :wiki_enabled + .clearfix = f.label :description - .input= f.text_area :description, :class => "xxlarge" - .clear + .input + = f.text_area :description, :placeholder => "project description", :class => "xxlarge", :rows => 5 + %p.hint Markdown is enabled. %br .actions = f.submit 'Save', :class => "btn primary" = link_to 'Cancel', [:admin, @admin_project], :class => "btn" - = link_to 'Destroy', [:admin, @admin_project], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger right" - -:javascript - $(function(){ - taggifyForm(); - $('#project_owner_id').chosen(); - $('#project_default_branch').chosen(); - }) + - unless @admin_project.new_record? + .right + = link_to 'Remove Project', [:admin, @admin_project], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger" diff --git a/app/views/admin/projects/new.html.haml b/app/views/admin/projects/new.html.haml index dfbd3edf08011fb5b05288e3a3fce91be69c2994..3f3d51d038ac7adb6aa4dbae2eae5078742af802 100644 --- a/app/views/admin/projects/new.html.haml +++ b/app/views/admin/projects/new.html.haml @@ -1,6 +1,11 @@ -%h1 New project +.project_new_holder + %h3 New Project + %hr + = render 'form' +%div.ajax_loader.hide + %center + %div.padded= image_tag "ajax_loader.gif" + %h3.prepend-top Creating project & repository. Please wait for few minutes -= render 'form' - -%br -= link_to 'Back', admin_projects_path, :class => '' +:javascript + $(function(){ new Projects(); }); diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 8f6244f2f5b64658db596395d080722bc759db40..b46ceb550e8a3d09e6f371c59b1743a5b616af61 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -59,4 +59,4 @@ = link_to 'Cancel', @project, :class => "btn" - unless @project.new_record? .right - = link_to 'Remove', @project, :confirm => 'Are you sure?', :method => :delete, :class => "btn danger" + = link_to 'Remove Project', @project, :confirm => 'Are you sure?', :method => :delete, :class => "btn danger" diff --git a/lib/post-receive-hook b/lib/post-receive-hook index 93eb96c2a6dacfb3a03808be33a5ca9d5ffe9e35..7d084394dead07fd712cc73dd951d29c58571c6c 100755 --- a/lib/post-receive-hook +++ b/lib/post-receive-hook @@ -8,5 +8,5 @@ do # For every branch or tag that was pushed, create a Resque job in redis. pwd=`pwd` reponame=`basename "$pwd" | cut -d. -f1` - env -i redis-cli rpush "resque:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$reponame\",\"$oldrev\",\"$newrev\",\"$ref\",\"$GL_USER\"]}" > /dev/null 2>&1 + redis-cli rpush "resque:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$reponame\",\"$oldrev\",\"$newrev\",\"$ref\",\"$GL_USER\"]}" > /dev/null 2>&1 done