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
Boxiang Sun
gitlab-ce
Commits
1b28a2c1
Commit
1b28a2c1
authored
Dec 03, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check resolved_ref before checking if protected
parent
9b4e45c3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/models/project.rb
app/models/project.rb
+2
-1
No files found.
app/models/project.rb
View file @
1b28a2c1
...
@@ -1737,10 +1737,11 @@ class Project < ActiveRecord::Base
...
@@ -1737,10 +1737,11 @@ class Project < ActiveRecord::Base
end
end
def
protected_for?
(
ref
)
def
protected_for?
(
ref
)
return
false
if
ref
.
nil?
raise
Repository
::
AmbiguousRefError
if
repository
.
ambiguous_ref?
(
ref
)
raise
Repository
::
AmbiguousRefError
if
repository
.
ambiguous_ref?
(
ref
)
resolved_ref
=
repository
.
expand_ref
(
ref
)
||
ref
resolved_ref
=
repository
.
expand_ref
(
ref
)
||
ref
return
false
unless
Gitlab
::
Git
.
tag_ref?
(
resolved_ref
)
||
Gitlab
::
Git
.
branch_ref?
(
resolved_ref
)
ref_name
=
if
resolved_ref
==
ref
ref_name
=
if
resolved_ref
==
ref
Gitlab
::
Git
.
ref_name
(
resolved_ref
)
Gitlab
::
Git
.
ref_name
(
resolved_ref
)
else
else
...
...
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