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
6fd6c746
Commit
6fd6c746
authored
Jun 11, 2019
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix EE specific relationship and tests
Fixing EE relationsip
parent
5f853325
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
2 deletions
+5
-2
ee/app/models/ee/merge_request.rb
ee/app/models/ee/merge_request.rb
+1
-1
ee/app/models/ee/project.rb
ee/app/models/ee/project.rb
+1
-1
ee/app/models/merge_train.rb
ee/app/models/merge_train.rb
+1
-0
ee/spec/factories/merge_trains.rb
ee/spec/factories/merge_trains.rb
+2
-0
No files found.
ee/app/models/ee/merge_request.rb
View file @
6fd6c746
...
...
@@ -79,7 +79,7 @@ module EE
end
def
get_on_train!
(
user
)
create_merge_train!
(
user:
user
)
create_merge_train!
(
user:
user
,
target_project:
target_project
,
target_branch:
target_branch
)
end
def
get_off_train!
...
...
ee/app/models/ee/project.rb
View file @
6fd6c746
...
...
@@ -62,7 +62,7 @@ module EE
accepts_nested_attributes_for
:software_license_policies
,
allow_destroy:
true
has_many
:packages
,
class_name:
'Packages::Package'
has_many
:package_files
,
through: :packages
,
class_name:
'Packages::PackageFile'
has_many
:merge_trains
has_many
:merge_trains
,
foreign_key:
'target_project_id'
,
inverse_of: :target_project
has_many
:sourced_pipelines
,
class_name:
'Ci::Sources::Pipeline'
,
foreign_key: :source_project_id
...
...
ee/app/models/merge_train.rb
View file @
6fd6c746
# frozen_string_literal: true
class
MergeTrain
<
ApplicationRecord
belongs_to
:target_project
,
class_name:
"Project"
belongs_to
:merge_request
belongs_to
:user
belongs_to
:pipeline
,
class_name:
'Ci::Pipeline'
...
...
ee/spec/factories/merge_trains.rb
View file @
6fd6c746
...
...
@@ -2,6 +2,8 @@
FactoryBot
.
define
do
factory
:merge_train
do
target_branch
'master'
target_project
factory: :project
merge_request
user
pipeline
factory: :ci_pipeline
...
...
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