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
Jérome Perrin
gitlab-ce
Commits
70982bb4
Commit
70982bb4
authored
Apr 06, 2017
by
Kim "BKC" Carlbäcker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hopefully this works
parent
47907a41
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+1
-1
spec/models/environment_spec.rb
spec/models/environment_spec.rb
+1
-1
No files found.
lib/gitlab/git/repository.rb
View file @
70982bb4
...
@@ -456,7 +456,7 @@ module Gitlab
...
@@ -456,7 +456,7 @@ module Gitlab
def
ref_name_for_sha
(
ref_path
,
sha
)
def
ref_name_for_sha
(
ref_path
,
sha
)
Gitlab
::
GitalyClient
.
migrate
(
:find_ref_name
)
do
|
is_enabled
|
Gitlab
::
GitalyClient
.
migrate
(
:find_ref_name
)
do
|
is_enabled
|
if
is_enabled
if
is_enabled
Gitlab
::
GitalyClient
::
Ref
.
find_ref_name
(
self
,
sha
,
ref_path
)
gitaly_ref_client
.
find_ref_name
(
sha
,
ref_path
)
else
else
args
=
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
for-each-ref --count=1
#{
ref_path
}
--contains
#{
sha
}
)
args
=
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
for-each-ref --count=1
#{
ref_path
}
--contains
#{
sha
}
)
...
...
spec/models/environment_spec.rb
View file @
70982bb4
...
@@ -116,7 +116,7 @@ describe Environment, models: true do
...
@@ -116,7 +116,7 @@ describe Environment, models: true do
end
end
it
'calls GitalyClient'
do
it
'calls GitalyClient'
do
expect
(
Gitlab
::
GitalyClient
::
Ref
).
to
receive
(
:find_ref_name
).
with
(
project
.
repository
.
raw_repository
,
commit
.
id
,
environment
.
ref_path
)
expect
_any_instance_of
(
Gitlab
::
GitalyClient
::
Ref
).
to
receive
(
:find_ref_name
)
environment
.
first_deployment_for
(
commit
)
environment
.
first_deployment_for
(
commit
)
end
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