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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
0f7c4b2f
Commit
0f7c4b2f
authored
Jul 17, 2020
by
Thong Kuah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use available ::Gitlab::Git::COMMIT_ID constant
parent
cc17af1f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
spec/support/helpers/test_env.rb
spec/support/helpers/test_env.rb
+1
-3
No files found.
spec/support/helpers/test_env.rb
View file @
0f7c4b2f
...
...
@@ -6,8 +6,6 @@ module TestEnv
ComponentFailedToInstallError
=
Class
.
new
(
StandardError
)
SHA_REGEX
=
/\A[0-9a-f]{5,40}\z/i
.
freeze
# When developing the seed repository, comment out the branch you will modify.
BRANCH_SHA
=
{
'signed-commits'
=>
'6101e87'
,
...
...
@@ -524,7 +522,7 @@ module TestEnv
def
component_matches_git_sha?
(
component_folder
,
expected_version
)
# Not a git SHA, so return early
return
false
unless
expected_version
=~
SHA_REGEX
return
false
unless
expected_version
=~
::
Gitlab
::
Git
::
COMMIT_ID
sha
,
exit_status
=
Gitlab
::
Popen
.
popen
(
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
rev-parse HEAD)
,
component_folder
)
return
false
if
exit_status
!=
0
...
...
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