Merge branch 'master' of dev.gitlabhq.com:gitlabhq

app/assets/stylesheets/common.scss

@@ -1147,3 +1147,7 @@ li.note {
     max-width:100%;
   }
 }
+
+.wiki_content code, .readme code{
+  background-color: inherit;
+}

app/views/wikis/show.html.haml

@@ -7,8 +7,8 @@
       = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do
         Edit
 %hr
-
+.wiki_content
-= markdown_to_html @wiki.content
+  = markdown_to_html @wiki.content
 
 %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at}
 - if can? current_user, :admin_wiki, @project

db/schema.rb

@@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
     t.integer  "assignee_id"
     t.integer  "author_id"
     t.integer  "project_id"
-    t.datetime "created_at",                     :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",                     :null => false
+    t.datetime "updated_at"
     t.boolean  "closed",      :default => false, :null => false
     t.integer  "position",    :default => 0
     t.boolean  "critical",    :default => false, :null => false
@@ -43,8 +43,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
 
   create_table "keys", :force => true do |t|
     t.integer  "user_id"
-    t.datetime "created_at", :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at", :null => false
+    t.datetime "updated_at"
     t.text     "key"
     t.string   "title"
     t.string   "identifier"
@@ -59,8 +59,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
     t.integer  "assignee_id"
     t.string   "title"
     t.boolean  "closed",        :default => false, :null => false
-    t.datetime "created_at",                       :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",                       :null => false
+    t.datetime "updated_at"
     t.text     "st_commits"
     t.text     "st_diffs"
     t.boolean  "merged",        :default => false, :null => false
@@ -73,8 +73,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
     t.string   "noteable_id"
     t.string   "noteable_type"
     t.integer  "author_id"
-    t.datetime "created_at",    :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",    :null => false
+    t.datetime "updated_at"
     t.integer  "project_id"
     t.string   "attachment"
     t.string   "line_code"
@@ -87,8 +87,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
     t.string   "name"
     t.string   "path"
     t.text     "description"
-    t.datetime "created_at",                                   :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",                                   :null => false
+    t.datetime "updated_at"
     t.boolean  "private_flag",           :default => true,     :null => false
     t.string   "code"
     t.integer  "owner_id"
@@ -111,8 +111,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
     t.text     "content"
     t.integer  "author_id",  :null => false
     t.integer  "project_id", :null => false
-    t.datetime "created_at", :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at", :null => false
+    t.datetime "updated_at"
     t.string   "file_name"
     t.datetime "expires_at"
   end
@@ -145,8 +145,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at",                                               :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",                                               :null => false
+    t.datetime "updated_at"
     t.string   "name"
     t.boolean  "admin",                                 :default => false, :null => false
     t.integer  "projects_limit",                        :default => 10
@@ -165,16 +165,16 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
   create_table "users_projects", :force => true do |t|
     t.integer  "user_id",                       :null => false
     t.integer  "project_id",                    :null => false
-    t.datetime "created_at",                    :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",                    :null => false
+    t.datetime "updated_at"
     t.integer  "project_access", :default => 0, :null => false
   end
 
   create_table "web_hooks", :force => true do |t|
     t.string   "url"
     t.integer  "project_id"
-    t.datetime "created_at", :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at", :null => false
+    t.datetime "updated_at"
   end
 
   create_table "wikis", :force => true do |t|

doc/debian_ubuntu.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+sudo apt-get update
+sudo apt-get upgrade
+
+sudo apt-get install -y git-core wget curl gcc checkinstall libxml2-dev libxslt-dev sqlite3 libsqlite3-dev libcurl4-openssl-dev libreadline5-dev libc6-dev libssl-dev libmysql++-dev make build-essential zlib1g-dev libicu-dev redis-server openssh-server git-core python-dev python-pip
+
+wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
+tar xfvz ruby-1.9.2-p290.tar.gz
+cd ruby-1.9.2-p290
+./configure
+make
+sudo make install
+
+sudo adduser \
+  --system \
+  --shell /bin/sh \
+  --gecos 'git version control' \
+  --group \
+  --disabled-password \
+  --home /home/git \
+  git
+
+sudo adduser --disabled-login --gecos 'gitlab system' gitlab
+
+sudo usermod -a -G git gitlab
+
+sudo -H -u gitlab ssh-keygen -q -N '' -t rsa -f /home/gitlab/.ssh/id_rsa
+
+cd /home/git
+sudo -H -u git git clone git://github.com/gitlabhq/gitolite /home/git/gitolite
+
+sudo -u git -H /home/git/gitolite/src/gl-system-install
+sudo cp /home/gitlab/.ssh/id_rsa.pub /home/git/gitlab.pub
+sudo chmod 777 /home/git/gitlab.pub
+
+sudo -u git -H sed -i 's/0077/0007/g' /home/git/share/gitolite/conf/example.gitolite.rc
+sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gl-setup -q /home/git/gitlab.pub"
+
+sudo chmod -R g+rwX /home/git/repositories/
+sudo chown -R git:git /home/git/repositories/
+
+sudo -u gitlab -H git clone git@localhost:gitolite-admin.git /tmp/gitolite-admin
+rm -rf /tmp/gitolite-admin

doc/installation.md

@@ -43,7 +43,7 @@ The installation consists of 6 steps:
 >     apt-get install curl sudo
 >     
 >     # 3 steps in 1 command :)
->     curl http://dl.dropbox.com/u/936096/debian_ubuntu.sh | sh
+>     curl https://raw.github.com/gitlabhq/gitlabhq/master/doc/debian_ubuntu.sh | sh
 > 
 > Now you can go to step 4"
 > - - -