diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-09 17:23:36 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-09 17:23:36 +0300 |
| commit | 1259f2ca64c3aaa68fa55caee0a25bec54682834 (patch) | |
| tree | b649119f6783d6a25e4a32fe15d0cc584a0d42ec | |
| parent | 6775ba9f4a6d118944de9af341a4fb98ae75a088 (diff) | |
| parent | d21d316b4899ed29ee07cbcf82d4c18bce0bd114 (diff) | |
| download | gitlab-ci-1259f2ca64c3aaa68fa55caee0a25bec54682834.tar.gz | |
Merge branch 'master' into 3-0-stable
Conflicts:
doc/installation.md
| -rw-r--r-- | app/controllers/runner_projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/runner.rb | 1 | ||||
| -rw-r--r-- | doc/installation.md | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/runner_projects_controller.rb b/app/controllers/runner_projects_controller.rb index 655c16d..f69861d 100644 --- a/app/controllers/runner_projects_controller.rb +++ b/app/controllers/runner_projects_controller.rb @@ -10,7 +10,7 @@ class RunnerProjectsController < ApplicationController def create @runner = Runner.find(params[:runner_project][:runner_id]) - if @runner.assign_to(@project, current_user) + if @runner.assign_to(project, current_user) redirect_to project_runner_projects_path else redirect_to project_runner_projects_path, alert: 'Failed adding runner deploy key to GitLab project' diff --git a/app/models/runner.rb b/app/models/runner.rb index 9fdfe7e..7ab8fce 100644 --- a/app/models/runner.rb +++ b/app/models/runner.rb @@ -38,6 +38,7 @@ class Runner < ActiveRecord::Base raise "Can't add deploy key" unless result end rescue => ex + logger.warn "Assign runner to project failed: #{ex}" false end end diff --git a/doc/installation.md b/doc/installation.md index 746673c..01abd3f 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -101,6 +101,10 @@ You can use either MySQL or PostgreSQL. # Edit application settings sudo -u gitlab_ci -H cp config/application.yml.example config/application.yml sudo -u gitlab_ci -H vim config/application.yml + + # Create a sockets directory + sudo -u gitlab_ci -H mkdir tmp/sockets/ + sudo chmod -R u+rwX tmp/sockets/ ### Install gems |