Commit ad5d2c3e authored by Valery Sizov's avatar Valery Sizov

fix of API

parent 77bda265
...@@ -180,7 +180,7 @@ Settings['gitlab_ci'] ||= Settingslogic.new({}) ...@@ -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['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['add_pusher'] = false if Settings.gitlab_ci['add_pusher'].nil?
Settings.gitlab_ci['url'] ||= Settings.send(:build_gitlab_ci_url) 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 # Reply by email
......
...@@ -12,8 +12,12 @@ module Ci ...@@ -12,8 +12,12 @@ module Ci
end end
class Build < Grape::Entity class Build < Grape::Entity
expose :id, :commands, :path, :ref, :sha, :project_id, :repo_url, expose :id, :commands, :ref, :sha, :project_id, :repo_url,
:before_sha, :timeout, :allow_git_fetch, :project_name, :options :before_sha, :allow_git_fetch, :project_name, :options
expose :timeout do |model|
model.timeout
end
expose :variables expose :variables
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment