Merge branch '6-0-stable' of dev.gitlab.org:gitlab/gitlabhq

Conflicts:
	VERSION

VERSION

-6.0.0-ee.rc1
+6.0.0-ee

app/assets/stylesheets/sections/events.scss

@@ -35,6 +35,14 @@
     padding-top: 0;
   }
 
+  &.event-inline {
+    .avatar {
+      width: 16px;
+      height: 16px;
+    }
+  }
+
+  padding: 14px 0px;
   border-bottom: 1px solid #eee;
   .event-title {
     color: #333;
@@ -46,6 +54,7 @@
   }
   .event-body {
     margin-left: 35px;
+    margin-right: 100px;
 
     .commit p {
       color: #666;
@@ -66,12 +75,10 @@
         margin: 0 20px;
       }
 
-      .note-file-attach {
-        .note-image-attach {
-          margin-top: 4px;
-          margin-left: 0px;
-          max-width: 200px;
-        }
+      .note-image-attach {
+        margin-top: 4px;
+        margin-left: 0px;
+        max-width: 200px;
       }
     }
     .event-note-icon {
@@ -103,7 +110,6 @@
     }
   }
 
-  padding: 12px 0px;
   &:last-child { border:none }
 
   .event_commits {

app/helpers/events_helper.rb

@@ -121,4 +121,8 @@ module EventsHelper
       end
     end
   end
+
+  def event_note(text)
+    sanitize(markdown(truncate(text, length: 150)), tags: %w(a img b pre p))
+  end
 end

app/models/event.rb

@@ -291,4 +291,14 @@ class Event < ActiveRecord::Base
       "Wall"
     end.downcase
   end
+
+  def body?
+    if push?
+      push_with_commits?
+    elsif note?
+      true
+    else
+      target.respond_to? :title
+    end
+  end
 end

app/models/project.rb

@@ -430,6 +430,7 @@ class Project < ActiveRecord::Base
       # However we cannot allow rollback since we moved repository
       # So we basically we mute exceptions in next actions
       begin
+        gitlab_shell.mv_repository("#{old_path_with_namespace}.wiki", "#{new_path_with_namespace}.wiki")
         gitlab_shell.rm_satellites(old_path_with_namespace)
         send_move_instructions
       rescue

app/views/events/_event.html.haml

 - if event.proper?
-  %div.event-item
+  .event-item{class: "#{event.body? ? "event-block" : "event-inline" }"}
     %span.cgray.pull-right
       #{time_ago_in_words(event.created_at)} ago.
 

app/views/events/event/_note.html.haml

@@ -10,7 +10,7 @@
   .event-note
     .md
       %i.icon-comment-alt.event-note-icon
-      = sanitize(markdown(truncate(event.target.note, length: 150)), tags: %w(a img b pre p))
+      = event_note(event.target.note)
     - note = event.target
     - if note.attachment.url
       - if note.attachment.image?

app/views/public/projects/index.html.haml

@@ -18,7 +18,7 @@
         .project-title
           %i.icon-share.cgray
           = link_to public_project_path(project) do
-            = project.name_with_namespace
+            %strong= project.name_with_namespace
           .pull-right
             %pre.public-clone git clone #{project.http_url_to_repo}
 

doc/install/installation.md

@@ -153,10 +153,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
     cd /home/git/gitlab
 
     # Checkout to stable release
-    sudo -u git -H git checkout 5-4-stable
+    sudo -u git -H git checkout 6-0-stable
 
 **Note:**
-You can change `5-4-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+You can change `6-0-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 
 ## Configure it
 
@@ -232,10 +232,10 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
     sudo gem install charlock_holmes --version '0.6.9.4'
 
     # For MySQL (note, the option says "without ... postgres")
-    sudo -u git -H bundle install --deployment --without development test postgres unicorn aws
+    sudo -u git -H bundle install --deployment --without development test postgres aws
 
     # Or for PostgreSQL (note, the option says "without ... mysql")
-    sudo -u git -H bundle install --deployment --without development test mysql unicorn aws
+    sudo -u git -H bundle install --deployment --without development test mysql aws
 
 
 ## Initialize Database and Activate Advanced Features