Download as
Browse Code »

Commit bae4efa7cf1ebedc0f74627da599a4cd5e93fd7f

Authored by Dmitriy Zaporozhets
2 parents 46906ca9 671424a8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 5 changed files with 69 additions and 21 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @bae4efa
... ... @@ -1147,3 +1147,7 @@ li.note {
1147 1147 max-width:100%;
1148 1148 }
1149 1149 }
  1150 +
  1151 +.wiki_content code, .readme code{
  1152 + background-color: inherit;
  1153 +}
... ...
app/views/wikis/show.html.haml
  Diff comments   View file @bae4efa
... ... @@ -7,8 +7,8 @@
7 7 = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do
8 8 Edit
9 9 %hr
10   -
11   -= markdown_to_html @wiki.content
  10 +.wiki_content
  11 + = markdown_to_html @wiki.content
12 12  
13 13 %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at}
14 14 - if can? current_user, :admin_wiki, @project
... ...
db/schema.rb
  Diff comments   View file @bae4efa
... ... @@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
30 30 t.integer "assignee_id"
31 31 t.integer "author_id"
32 32 t.integer "project_id"
33   - t.datetime "created_at", :null => false
34   - t.datetime "updated_at", :null => false
  33 + t.datetime "created_at"
  34 + t.datetime "updated_at"
35 35 t.boolean "closed", :default => false, :null => false
36 36 t.integer "position", :default => 0
37 37 t.boolean "critical", :default => false, :null => false
... ... @@ -43,8 +43,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
43 43  
44 44 create_table "keys", :force => true do |t|
45 45 t.integer "user_id"
46   - t.datetime "created_at", :null => false
47   - t.datetime "updated_at", :null => false
  46 + t.datetime "created_at"
  47 + t.datetime "updated_at"
48 48 t.text "key"
49 49 t.string "title"
50 50 t.string "identifier"
... ... @@ -59,8 +59,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
59 59 t.integer "assignee_id"
60 60 t.string "title"
61 61 t.boolean "closed", :default => false, :null => false
62   - t.datetime "created_at", :null => false
63   - t.datetime "updated_at", :null => false
  62 + t.datetime "created_at"
  63 + t.datetime "updated_at"
64 64 t.text "st_commits"
65 65 t.text "st_diffs"
66 66 t.boolean "merged", :default => false, :null => false
... ... @@ -73,8 +73,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
73 73 t.string "noteable_id"
74 74 t.string "noteable_type"
75 75 t.integer "author_id"
76   - t.datetime "created_at", :null => false
77   - t.datetime "updated_at", :null => false
  76 + t.datetime "created_at"
  77 + t.datetime "updated_at"
78 78 t.integer "project_id"
79 79 t.string "attachment"
80 80 t.string "line_code"
... ... @@ -87,8 +87,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
87 87 t.string "name"
88 88 t.string "path"
89 89 t.text "description"
90   - t.datetime "created_at", :null => false
91   - t.datetime "updated_at", :null => false
  90 + t.datetime "created_at"
  91 + t.datetime "updated_at"
92 92 t.boolean "private_flag", :default => true, :null => false
93 93 t.string "code"
94 94 t.integer "owner_id"
... ... @@ -111,8 +111,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
111 111 t.text "content"
112 112 t.integer "author_id", :null => false
113 113 t.integer "project_id", :null => false
114   - t.datetime "created_at", :null => false
115   - t.datetime "updated_at", :null => false
  114 + t.datetime "created_at"
  115 + t.datetime "updated_at"
116 116 t.string "file_name"
117 117 t.datetime "expires_at"
118 118 end
... ... @@ -145,8 +145,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
145 145 t.datetime "last_sign_in_at"
146 146 t.string "current_sign_in_ip"
147 147 t.string "last_sign_in_ip"
148   - t.datetime "created_at", :null => false
149   - t.datetime "updated_at", :null => false
  148 + t.datetime "created_at"
  149 + t.datetime "updated_at"
150 150 t.string "name"
151 151 t.boolean "admin", :default => false, :null => false
152 152 t.integer "projects_limit", :default => 10
... ... @@ -165,16 +165,16 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
165 165 create_table "users_projects", :force => true do |t|
166 166 t.integer "user_id", :null => false
167 167 t.integer "project_id", :null => false
168   - t.datetime "created_at", :null => false
169   - t.datetime "updated_at", :null => false
  168 + t.datetime "created_at"
  169 + t.datetime "updated_at"
170 170 t.integer "project_access", :default => 0, :null => false
171 171 end
172 172  
173 173 create_table "web_hooks", :force => true do |t|
174 174 t.string "url"
175 175 t.integer "project_id"
176   - t.datetime "created_at", :null => false
177   - t.datetime "updated_at", :null => false
  176 + t.datetime "created_at"
  177 + t.datetime "updated_at"
178 178 end
179 179  
180 180 create_table "wikis", :force => true do |t|
... ...
doc/debian_ubuntu.sh 0 → 100644
  Diff comments   View file @bae4efa
... ... @@ -0,0 +1,44 @@
  1 +#!/bin/sh
  2 +
  3 +sudo apt-get update
  4 +sudo apt-get upgrade
  5 +
  6 +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
  7 +
  8 +wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
  9 +tar xfvz ruby-1.9.2-p290.tar.gz
  10 +cd ruby-1.9.2-p290
  11 +./configure
  12 +make
  13 +sudo make install
  14 +
  15 +sudo adduser \
  16 + --system \
  17 + --shell /bin/sh \
  18 + --gecos 'git version control' \
  19 + --group \
  20 + --disabled-password \
  21 + --home /home/git \
  22 + git
  23 +
  24 +sudo adduser --disabled-login --gecos 'gitlab system' gitlab
  25 +
  26 +sudo usermod -a -G git gitlab
  27 +
  28 +sudo -H -u gitlab ssh-keygen -q -N '' -t rsa -f /home/gitlab/.ssh/id_rsa
  29 +
  30 +cd /home/git
  31 +sudo -H -u git git clone git://github.com/gitlabhq/gitolite /home/git/gitolite
  32 +
  33 +sudo -u git -H /home/git/gitolite/src/gl-system-install
  34 +sudo cp /home/gitlab/.ssh/id_rsa.pub /home/git/gitlab.pub
  35 +sudo chmod 777 /home/git/gitlab.pub
  36 +
  37 +sudo -u git -H sed -i 's/0077/0007/g' /home/git/share/gitolite/conf/example.gitolite.rc
  38 +sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gl-setup -q /home/git/gitlab.pub"
  39 +
  40 +sudo chmod -R g+rwX /home/git/repositories/
  41 +sudo chown -R git:git /home/git/repositories/
  42 +
  43 +sudo -u gitlab -H git clone git@localhost:gitolite-admin.git /tmp/gitolite-admin
  44 +rm -rf /tmp/gitolite-admin
... ...
doc/installation.md
  Diff comments   View file @bae4efa
... ... @@ -43,7 +43,7 @@ The installation consists of 6 steps:
43 43 > apt-get install curl sudo
44 44 >
45 45 > # 3 steps in 1 command :)
46   -> curl http://dl.dropbox.com/u/936096/debian_ubuntu.sh | sh
  46 +> curl https://raw.github.com/gitlabhq/gitlabhq/master/doc/debian_ubuntu.sh | sh
47 47 >
48 48 > Now you can go to step 4"
49 49 > - - -
... ...