Show More
@@ -104,6 +104,10 b' class MergeFailureReason(object):' | |||||
104 | # The source repo reference is missing. |
|
104 | # The source repo reference is missing. | |
105 | MISSING_SOURCE_REF = 10 |
|
105 | MISSING_SOURCE_REF = 10 | |
106 |
|
106 | |||
|
107 | # The merge was not successful, there are conflicts related to sub | |||
|
108 | # repositories. | |||
|
109 | SUBREPO_MERGE_FAILED = 11 | |||
|
110 | ||||
107 |
|
111 | |||
108 | class UpdateFailureReason(object): |
|
112 | class UpdateFailureReason(object): | |
109 | """ |
|
113 | """ |
@@ -105,6 +105,9 b' class PullRequestModel(BaseModel):' | |||||
105 | MergeFailureReason.MISSING_SOURCE_REF: lazy_ugettext( |
|
105 | MergeFailureReason.MISSING_SOURCE_REF: lazy_ugettext( | |
106 | 'This pull request cannot be merged because the source ' |
|
106 | 'This pull request cannot be merged because the source ' | |
107 | 'reference is missing.'), |
|
107 | 'reference is missing.'), | |
|
108 | MergeFailureReason.SUBREPO_MERGE_FAILED: lazy_ugettext( | |||
|
109 | 'This pull request cannot be merged because of conflicts related ' | |||
|
110 | 'to sub repositories.'), | |||
108 | } |
|
111 | } | |
109 |
|
112 | |||
110 | UPDATE_STATUS_MESSAGES = { |
|
113 | UPDATE_STATUS_MESSAGES = { |
General Comments 0
You need to be logged in to leave comments.
Login now