Merge branch 'master' into 90-pull

Conflicts:
	app/assets/stylesheets/design/custom.scss

app/assets/stylesheets/design/custom.scss

@@ -1181,6 +1181,20 @@ table.tablesorter tr td.no_results {
 }
 /* end */
 
+hr.bootstrap {
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+
+.fork-modal {
+  top: 45%;
+}
+
+.modal-body-fork {
+  max-height: 280px;
+}
+
 .label-bootstrap.label-info.font14 a {
   color: #FFFFFF;
 }

app/models/project.rb

@@ -42,12 +42,12 @@ class Project < ActiveRecord::Base
 
   after_create :attach_to_personal_repository
   after_create :create_git_repo
-  after_create {|p| p.fork_git_repo unless p.is_root?}
   after_save :create_wiki
+  after_commit(:on => :create) {|p| p.fork_git_repo unless p.is_root?} # later with resque
 
   after_destroy :destroy_git_repo
   after_destroy :destroy_wiki
-  after_save {|p| p.import_attached_srpm if p.srpm?} # later with resque # should be after create_git_repo
+  after_commit(:on => :create) {|p| p.import_attached_srpm if p.srpm?}# later with resque # should be after create_git_repo
   # after_rollback lambda { destroy_git_repo rescue true if new_record? }
 
   has_ancestry

app/views/layouts/application.html.haml

@@ -54,4 +54,4 @@
         .both
 
     %footer= render "layouts/menu/bottom"
-    = render 'layouts/counters' unless current_user.try(:admin?)
+    = render 'layouts/counters' if !current_user.try(:admin?) && Rails.env.production?

app/views/projects/git/base/_fork.html.haml

@@ -12,12 +12,15 @@
 
 - if can? :fork, @project
   .r#fork-and-edit= link_to t('layout.projects.fork_and_edit'), '#forkModal', :class => 'button', 'data-toggle' => 'modal'
-  #forkModal.modal{:style => 'display: none;'}
+  #forkModal.modal.fork-modal{:style => 'display: none;'}
     .modal-header
       %a.close{"data-dismiss" => "modal"} ×
       %h3=t 'layout.projects.fork_modal_header'
-    .modal-footer=render 'choose_fork', :owner => current_user
+    .modal-body.modal-body-fork
+      =render 'choose_fork', :owner => current_user
+      %hr.bootstrap
       - Group.can_own_project(current_user).each do |group|
-      .modal-footer=render 'choose_fork', :owner => group
+        =render 'choose_fork', :owner => group
+        %hr.bootstrap
 - if can? :create, @project.build_lists.new
   .r{:style => "display: block"}= link_to t('layout.projects.new_build_list'), new_project_build_list_path(@project), :class => 'button'