diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-01 12:10:25 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-01 12:10:25 +0200 |
| commit | 0a1fe32be5ebf4af63c59017304810c4abcbd816 (patch) | |
| tree | 59c5fea0a5d211be78c0f44c07fca41ace2f08a2 /lib | |
| parent | c473b30398191c5715b98e4bf51cf40e9b1587cf (diff) | |
| download | gitlab-ci-0a1fe32be5ebf4af63c59017304810c4abcbd816.tar.gz | |
Form fields. Project timeout and views styled
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/runner.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/resque.rake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/runner.rb b/lib/runner.rb index 13a2631..fc1a6c6 100644 --- a/lib/runner.rb +++ b/lib/runner.rb @@ -72,7 +72,7 @@ class Runner :chdir => path } - Timeout.timeout(TIMEOUT) do + Timeout.timeout(project.timeout) do Open3.popen3(vars, cmd, options) do |stdin, stdout, stderr, wait_thr| status = wait_thr.value.exitstatus @pid = wait_thr.pid diff --git a/lib/tasks/resque.rake b/lib/tasks/resque.rake new file mode 100644 index 0000000..9b30bb0 --- /dev/null +++ b/lib/tasks/resque.rake @@ -0,0 +1 @@ +require 'resque/tasks' |