Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
458bb24a5ae7
Commit
41a93ee4
authored
Oct 26, 2018
by
Sean McGivern
Browse files
Remove EE-specific code from DiscussionNote
parent
6a897228d06c
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/models/concerns/noteable.rb
View file @
458bb24a
...
...
@@ -23,7 +23,7 @@ def supports_resolvable_notes?
end
def
supports_discussions?
DiscussionNote
::
NOTEABLE_TYPES
.
include?
(
base_class_name
)
DiscussionNote
.
noteable_types
.
include?
(
base_class_name
)
end
def
discussions_rendered_on_frontend?
...
...
app/models/diff_note.rb
View file @
458bb24a
...
...
@@ -8,12 +8,14 @@ class DiffNote < Note
include
DiffPositionableNote
include
Gitlab
::
Utils
::
StrongMemoize
NOTEABLE_TYPES
=
%w(MergeRequest Commit)
.
freeze
def
self
.
noteable_types
%w(MergeRequest Commit)
end
validates
:original_position
,
presence:
true
validates
:position
,
presence:
true
validates
:line_code
,
presence:
true
,
line_code:
true
,
if: :on_text?
validates
:noteable_type
,
inclusion:
{
in:
NOTEABLE_TYPES
}
validates
:noteable_type
,
inclusion:
{
in:
noteable_types
}
validate
:positions_complete
validate
:verify_supported
validate
:diff_refs_match_commit
,
if: :for_commit?
...
...
app/models/discussion_note.rb
View file @
458bb24a
...
...
@@ -5,9 +5,11 @@
# A note of this type can be resolvable.
class
DiscussionNote
<
Note
# Names of all implementers of `Noteable` that support discussions.
NOTEABLE_TYPES
=
%w(MergeRequest Issue Commit Snippet)
.
freeze
def
self
.
noteable_types
%w(MergeRequest Issue Commit Snippet)
end
validates
:noteable_type
,
inclusion:
{
in:
NOTEABLE_TYPES
}
validates
:noteable_type
,
inclusion:
{
in:
noteable_types
}
def
discussion_class
(
*
)
Discussion
...
...
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