diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-05 15:21:29 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-05 15:21:29 +0400 |
| commit | ad5e5b5cfa5eae211aa6ad29e677d75b57a20a99 (patch) | |
| tree | 24365bc910fa0beb80dacd3783c27b12eca9ca31 | |
| parent | 8f48f386839816c79e6ad8b023d6ccbabc3d974a (diff) | |
| parent | d50cbb6aa41333bdc52a8870a7a04ed6fc9caa0f (diff) | |
Merge branch '6-6-stable' of github.com:gitlabhq/gitlabhq into 6-6-stable
| -rw-r--r-- | app/models/project_services/gitlab_ci_service.rb | 2 | ||||
| -rw-r--r-- | doc/install/installation.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb index 7f5380a4551..8d12500661d 100644 --- a/app/models/project_services/gitlab_ci_service.rb +++ b/app/models/project_services/gitlab_ci_service.rb @@ -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"] diff --git a/doc/install/installation.md b/doc/install/installation.md index d6e0a8a0012..aa0f48545a2 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -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 |