Download as
Browse Code »

Commit dd3a55064edb595215c70a77d655e5578ddfcb20

Authored by Dmitriy Zaporozhets
2 parents e652a753 a94b06e7
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @dd3a550
@@ -43,6 +43,6 @@ @@ -43,6 +43,6 @@
43 %li 43 %li
44 = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do 44 = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do
45 %i.icon-signout 45 %i.icon-signout
46 - %li 46 + %li.hidden-xs
47 = link_to current_user, class: "profile-pic", id: 'profile-pic' do 47 = link_to current_user, class: "profile-pic", id: 'profile-pic' do
48 = image_tag avatar_icon(current_user.email, 26), alt: 'User activity' 48 = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
doc/install/installation.md
  Diff comments   View file @dd3a550
@@ -121,6 +121,7 @@ Create a `git` user for Gitlab: @@ -121,6 +121,7 @@ Create a `git` user for Gitlab:
121 # 4. Database 121 # 4. Database
122 122
123 We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md). 123 We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md).
  124 +NOTE: because we need to make use of extensions you need at least pgsql 9.1.
124 125
125 # Install the database packages 126 # Install the database packages
126 sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev 127 sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev
@@ -129,7 +130,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da @@ -129,7 +130,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
129 sudo -u postgres psql -d template1 130 sudo -u postgres psql -d template1
130 131
131 # Create a user for GitLab. 132 # Create a user for GitLab.
132 - template1=# CREATE USER git; 133 + template1=# CREATE USER git CREATEDB;
133 134
134 # Create the GitLab production database & grant all privileges on database 135 # Create the GitLab production database & grant all privileges on database
135 template1=# CREATE DATABASE gitlabhq_production OWNER git; 136 template1=# CREATE DATABASE gitlabhq_production OWNER git;