Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
ad5d2c3e
Commit
ad5d2c3e
authored
Sep 14, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix of API
parent
77bda265
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-1
lib/ci/api/entities.rb
lib/ci/api/entities.rb
+6
-2
No files found.
config/initializers/1_settings.rb
View file @
ad5d2c3e
...
...
@@ -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
...
...
lib/ci/api/entities.rb
View file @
ad5d2c3e
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment