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
7a75a16d
Commit
7a75a16d
authored
Apr 22, 2020
by
DeAndre Harris
Committed by
Dylan Griffith
Apr 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes exception raised when viewing repository settings
parent
72d7d5cb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
ee/app/models/ee/project_import_state.rb
ee/app/models/ee/project_import_state.rb
+1
-0
ee/changelogs/unreleased/212673-fix-undefined-method-exception.yml
...logs/unreleased/212673-fix-undefined-method-exception.yml
+5
-0
ee/spec/models/project_import_state_spec.rb
ee/spec/models/project_import_state_spec.rb
+9
-0
No files found.
ee/app/models/ee/project_import_state.rb
View file @
7a75a16d
...
...
@@ -97,6 +97,7 @@ module EE
def
mirror_update_due?
return
false
unless
project
.
mirror_with_content?
return
false
unless
next_execution_timestamp?
return
false
if
project
.
archived?
return
false
if
hard_failed?
return
false
if
updating_mirror?
...
...
ee/changelogs/unreleased/212673-fix-undefined-method-exception.yml
0 → 100644
View file @
7a75a16d
---
title
:
Fix repository settings page loading issues for some imported projects with pull mirroring
merge_request
:
28879
author
:
type
:
fixed
ee/spec/models/project_import_state_spec.rb
View file @
7a75a16d
...
...
@@ -271,6 +271,15 @@ describe ProjectImportState, type: :model do
expect
(
import_state
.
mirror_update_due?
).
to
be
false
end
end
context
'when next_execution_timestamp is nil'
do
it
'returns false'
do
import_state
=
create
(
:import_state
,
:finished
,
:mirror
,
:repository
)
import_state
.
next_execution_timestamp
=
nil
expect
(
import_state
.
mirror_update_due?
).
to
be
false
end
end
end
describe
'#last_update_status'
do
...
...
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