BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6054c855
Commit
6054c855
authored
Jul 19, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only allow branches/tags, disallow SHA:
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13170854
parent
87604ed6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
13 deletions
+2
-13
pipeline.rb
app/models/ci/pipeline.rb
+2
-5
builds_spec.rb
spec/requests/api/builds_spec.rb
+0
-8
No files found.
app/models/ci/pipeline.rb
View file @
6054c855
...
...
@@ -20,12 +20,9 @@ module Ci
after_touch
:update_state
after_save
:keep_around_commits
# ref can't be HEAD
, can only be branch/tag name or SHA
# ref can't be HEAD
or SHA, can only be branch/tag name
scope
:latest_successful_for
,
->
(
ref
)
do
table
=
quoted_table_name
# TODO: Use `where(ref: ref).or(sha: ref)` in Rails 5
where
(
"
#{
table
}
.ref = ? OR
#{
table
}
.sha = ?"
,
ref
,
ref
).
success
.
order
(
id: :desc
)
where
(
ref:
ref
).
success
.
order
(
id: :desc
)
end
def
self
.
truncate_sha
(
sha
)
...
...
spec/requests/api/builds_spec.rb
View file @
6054c855
...
...
@@ -255,14 +255,6 @@ describe API::API, api: true do
create
(
:ci_build
,
status
,
:artifacts
,
pipeline:
new_pipeline
)
end
context
'with sha'
do
before
do
get
path_from_ref
(
pipeline
.
sha
)
end
it
(
'gives the file'
)
{
verify
}
end
context
'with regular branch'
do
before
do
pipeline
.
update
(
ref:
'master'
,
...
...
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