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
b7d1816f
Commit
b7d1816f
authored
Sep 29, 2020
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error message when design repository is not found
parent
81e93117
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/services/geo/design_repository_sync_service.rb
ee/app/services/geo/design_repository_sync_service.rb
+1
-1
ee/spec/services/geo/design_repository_sync_service_spec.rb
ee/spec/services/geo/design_repository_sync_service_spec.rb
+1
-1
No files found.
ee/app/services/geo/design_repository_sync_service.rb
View file @
b7d1816f
...
...
@@ -16,7 +16,7 @@ module Geo
rescue
Gitlab
::
Shell
::
Error
,
Gitlab
::
Git
::
BaseError
=>
e
# In some cases repository does not exist, the only way to know about this is to parse the error text.
# If it does not exist we should consider it as successfully downloaded.
if
e
.
message
.
include?
Gitlab
::
GitAccess
::
ERROR_MESSAGES
[
:no_repo
]
# rubocop:disable Cop/LineBreakAroundConditionalBlock
if
e
.
message
.
include?
Gitlab
::
GitAccess
Design
::
ERROR_MESSAGES
[
:no_repo
]
# rubocop:disable Cop/LineBreakAroundConditionalBlock
log_info
(
'Design repository is not found, marking it as successfully synced'
)
mark_sync_as_successful
(
missing_on_primary:
true
)
else
...
...
ee/spec/services/geo/design_repository_sync_service_spec.rb
View file @
b7d1816f
...
...
@@ -111,7 +111,7 @@ RSpec.describe Geo::DesignRepositorySyncService do
allow
(
repository
).
to
receive
(
:fetch_as_mirror
)
.
with
(
url_to_repo
,
remote_name:
'geo'
,
forced:
true
)
.
and_raise
(
Gitlab
::
Shell
::
Error
.
new
(
Gitlab
::
GitAccess
::
ERROR_MESSAGES
[
:no_repo
]))
.
and_raise
(
Gitlab
::
Shell
::
Error
.
new
(
Gitlab
::
GitAccess
Design
::
ERROR_MESSAGES
[
:no_repo
]))
subject
.
execute
...
...
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