Merge branch '6-6-stable' of github.com:gitlabhq/gitlabhq into 6-6-stable

This commit is contained in:
Dmitriy Zaporozhets
2014-03-05 13:21:29 +02:00
2 changed files with 2 additions and 2 deletions
@@ -36,7 +36,7 @@ class GitlabCiService < Service
end
def commit_status sha
response = HTTParty.get(commit_status_path(sha))
response = HTTParty.get(commit_status_path(sha), verify: false)
if response.code == 200 and response["status"]
response["status"]
+1 -1
View File
@@ -144,7 +144,7 @@ GitLab Shell is an ssh access and repository management software developed speci
# 5. Database
We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](doc/install/database_mysql.md).
We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md).
# Install the database packages
sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev