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
16a1ff38
Commit
16a1ff38
authored
Nov 18, 2019
by
Sean Carroll
Committed by
Douglas Barbosa Alexandre
Nov 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mark project_ci_cd_settings.merge_trains_enabled for removal
parent
fbcdd6f7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
app/models/project_ci_cd_setting.rb
app/models/project_ci_cd_setting.rb
+3
-0
ee/changelogs/unreleased/12796-remove-merge_trains_enabled-column-from-project_ci_cd_settings-t.yml
...e_trains_enabled-column-from-project_ci_cd_settings-t.yml
+6
-0
ee/spec/services/merge_trains/create_pipeline_service_spec.rb
...pec/services/merge_trains/create_pipeline_service_spec.rb
+1
-1
No files found.
app/models/project_ci_cd_setting.rb
View file @
16a1ff38
# frozen_string_literal: true
# frozen_string_literal: true
class
ProjectCiCdSetting
<
ApplicationRecord
class
ProjectCiCdSetting
<
ApplicationRecord
# TODO: remove once GitLab 12.7 is released
# https://gitlab.com/gitlab-org/gitlab/issues/36651
self
.
ignored_columns
+=
%i[merge_trains_enabled]
belongs_to
:project
,
inverse_of: :ci_cd_settings
belongs_to
:project
,
inverse_of: :ci_cd_settings
# The version of the schema that first introduced this model/table.
# The version of the schema that first introduced this model/table.
...
...
ee/changelogs/unreleased/12796-remove-merge_trains_enabled-column-from-project_ci_cd_settings-t.yml
0 → 100644
View file @
16a1ff38
---
title
:
Ignore project_ci_cd_settings.merge_trains_enabled column
merge_request
:
19695
author
:
type
:
added
ee/spec/services/merge_trains/create_pipeline_service_spec.rb
View file @
16a1ff38
...
@@ -11,7 +11,7 @@ describe MergeTrains::CreatePipelineService do
...
@@ -11,7 +11,7 @@ describe MergeTrains::CreatePipelineService do
before
do
before
do
project
.
add_maintainer
(
maintainer
)
project
.
add_maintainer
(
maintainer
)
stub_licensed_features
(
merge_pipelines:
true
,
merge_trains:
true
)
stub_licensed_features
(
merge_pipelines:
true
,
merge_trains:
true
)
project
.
update!
(
merge_pipelines_enabled:
true
,
merge_trains_enabled:
true
)
project
.
update!
(
merge_pipelines_enabled:
true
)
end
end
describe
'#execute'
do
describe
'#execute'
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