fix of API

2 files changed, 7 insertions, 3 deletions

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 3893bd45cf5..339419559d1 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -180,7 +180,7 @@ Settings['gitlab_ci'] ||= Settingslogic.new({})
 Settings.gitlab_ci['all_broken_builds']   = true if Settings.gitlab_ci['all_broken_builds'].nil?
 Settings.gitlab_ci['add_pusher']          = false if Settings.gitlab_ci['add_pusher'].nil?
 Settings.gitlab_ci['url']                 ||= Settings.send(:build_gitlab_ci_url)
-Settings.gitlab_ci['builds_path']         = File.expand_path(Settings.gitlab_ci['builds_path'] || "builds/", Rails.root + '/ci')
+Settings.gitlab_ci['builds_path']         = File.expand_path(Settings.gitlab_ci['builds_path'] || "builds/", Rails.root)
 
 #
 # Reply by email
diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb
index 2f0e9d36bc4..f5e601d4016 100644
--- a/lib/ci/api/entities.rb
+++ b/lib/ci/api/entities.rb
@@ -12,8 +12,12 @@ module Ci
       end
 
       class Build < Grape::Entity
-        expose :id, :commands, :path, :ref, :sha, :project_id, :repo_url,
-          :before_sha, :timeout, :allow_git_fetch, :project_name, :options
+        expose :id, :commands, :ref, :sha, :project_id, :repo_url,
+          :before_sha, :allow_git_fetch, :project_name, :options
+
+        expose :timeout do |model|
+          model.timeout
+        end
 
         expose :variables
       end