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
29ce0c58
Commit
29ce0c58
authored
Jul 30, 2020
by
Kyle Wiebers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'move-ee-commit-status-enums-to-ce' into 'master'"
This reverts merge request !37902
parent
69c310ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
3 deletions
+20
-3
app/models/commit_status_enums.rb
app/models/commit_status_enums.rb
+2
-3
ee/app/models/ee/commit_status_enums.rb
ee/app/models/ee/commit_status_enums.rb
+18
-0
No files found.
app/models/commit_status_enums.rb
View file @
29ce0c58
...
...
@@ -19,14 +19,13 @@ module CommitStatusEnums
scheduler_failure:
11
,
data_integrity_failure:
12
,
forward_deployment_failure:
13
,
protected_environment_failure:
1_000
,
insufficient_bridge_permissions:
1_001
,
downstream_bridge_project_not_found:
1_002
,
invalid_bridge_trigger:
1_003
,
upstream_bridge_project_not_found:
1_004
,
insufficient_upstream_permissions:
1_005
,
bridge_pipeline_is_child_pipeline:
1_006
,
downstream_pipeline_creation_failed:
1_007
}
end
end
CommitStatusEnums
.
prepend_if_ee
(
'EE::CommitStatusEnums'
)
ee/app/models/ee/commit_status_enums.rb
0 → 100644
View file @
29ce0c58
# frozen_string_literal: true
module
EE
module
CommitStatusEnums
extend
ActiveSupport
::
Concern
class_methods
do
extend
::
Gitlab
::
Utils
::
Override
override
:failure_reasons
def
failure_reasons
super
.
merge
(
protected_environment_failure:
1_000
,
upstream_bridge_project_not_found:
1_004
,
insufficient_upstream_permissions:
1_005
)
end
end
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