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
134a6c82
Commit
134a6c82
authored
May 19, 2020
by
Rajendra Kadam
Committed by
Peter Leitzen
May 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move prepend to last line in app models - 3
parent
d194f3dc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
app/models/project_authorization.rb
app/models/project_authorization.rb
+2
-1
app/models/project_services/chat_message/merge_message.rb
app/models/project_services/chat_message/merge_message.rb
+2
-2
changelogs/unreleased/app-models-3.yml
changelogs/unreleased/app-models-3.yml
+5
-0
No files found.
app/models/project_authorization.rb
View file @
134a6c82
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
class
ProjectAuthorization
<
ApplicationRecord
class
ProjectAuthorization
<
ApplicationRecord
include
FromUnion
include
FromUnion
prepend_if_ee
(
'::EE::ProjectAuthorization'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
belongs_to
:user
belongs_to
:user
belongs_to
:project
belongs_to
:project
...
@@ -30,3 +29,5 @@ class ProjectAuthorization < ApplicationRecord
...
@@ -30,3 +29,5 @@ class ProjectAuthorization < ApplicationRecord
end
end
end
end
end
end
ProjectAuthorization
.
prepend_if_ee
(
'::EE::ProjectAuthorization'
)
app/models/project_services/chat_message/merge_message.rb
View file @
134a6c82
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
module
ChatMessage
module
ChatMessage
class
MergeMessage
<
BaseMessage
class
MergeMessage
<
BaseMessage
prepend_if_ee
(
'::EE::ChatMessage::MergeMessage'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader
:merge_request_iid
attr_reader
:merge_request_iid
attr_reader
:source_branch
attr_reader
:source_branch
attr_reader
:target_branch
attr_reader
:target_branch
...
@@ -71,3 +69,5 @@ module ChatMessage
...
@@ -71,3 +69,5 @@ module ChatMessage
end
end
end
end
end
end
ChatMessage
::
MergeMessage
.
prepend_if_ee
(
'::EE::ChatMessage::MergeMessage'
)
changelogs/unreleased/app-models-3.yml
0 → 100644
View file @
134a6c82
---
title
:
Move prepend to last line in app models
3
merge_request
:
31829
author
:
Rajendra Kadam
type
:
fixed
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