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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
5ad4be29
Commit
5ad4be29
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove notify checkboxes from note forms
parent
70947fed
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
30 deletions
+12
-30
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+11
-2
app/contexts/notes/create_context.rb
app/contexts/notes/create_context.rb
+0
-2
app/models/note.rb
app/models/note.rb
+0
-11
app/views/notes/_form.html.haml
app/views/notes/_form.html.haml
+1
-10
app/views/walls/show.html.haml
app/views/walls/show.html.haml
+0
-5
No files found.
app/assets/stylesheets/sections/notes.scss
View file @
5ad4be29
...
@@ -274,6 +274,15 @@ ul.notes {
...
@@ -274,6 +274,15 @@ ul.notes {
}
}
.common-note-form
{
margin
:
0
;
height
:
140px
;
background
:
#F9F9F9
;
padding
:
3px
;
padding-bottom
:
25px
;
border
:
1px
solid
#DDD
;
}
.note-form-actions
{
.note-form-actions
{
background
:
#F9F9F9
;
background
:
#F9F9F9
;
...
@@ -281,8 +290,8 @@ ul.notes {
...
@@ -281,8 +290,8 @@ ul.notes {
padding
:
0
5px
;
padding
:
0
5px
;
.note-form-option
{
.note-form-option
{
margin-top
:
8
px
;
margin-top
:
10
px
;
margin-left
:
15
px
;
margin-left
:
30
px
;
@extend
.pull-left
;
@extend
.pull-left
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/contexts/notes/create_context.rb
View file @
5ad4be29
...
@@ -3,8 +3,6 @@ module Notes
...
@@ -3,8 +3,6 @@ module Notes
def
execute
def
execute
note
=
project
.
notes
.
new
(
params
[
:note
])
note
=
project
.
notes
.
new
(
params
[
:note
])
note
.
author
=
current_user
note
.
author
=
current_user
note
.
notify
=
params
[
:notify
].
present?
note
.
notify_author
=
params
[
:notify_author
].
present?
note
.
save
note
.
save
note
note
end
end
...
...
This diff is collapsed.
Click to expand it.
app/models/note.rb
View file @
5ad4be29
...
@@ -22,9 +22,6 @@ class Note < ActiveRecord::Base
...
@@ -22,9 +22,6 @@ class Note < ActiveRecord::Base
attr_accessible
:note
,
:noteable
,
:noteable_id
,
:noteable_type
,
:project_id
,
attr_accessible
:note
,
:noteable
,
:noteable_id
,
:noteable_type
,
:project_id
,
:attachment
,
:line_code
,
:commit_id
:attachment
,
:line_code
,
:commit_id
attr_accessor
:notify
attr_accessor
:notify_author
belongs_to
:project
belongs_to
:project
belongs_to
:noteable
,
polymorphic:
true
belongs_to
:noteable
,
polymorphic:
true
belongs_to
:author
,
class_name:
"User"
belongs_to
:author
,
class_name:
"User"
...
@@ -143,14 +140,6 @@ class Note < ActiveRecord::Base
...
@@ -143,14 +140,6 @@ class Note < ActiveRecord::Base
nil
nil
end
end
def
notify
@notify
||=
false
end
def
notify_author
@notify_author
||=
false
end
# Returns true if this is an upvote note,
# Returns true if this is an upvote note,
# otherwise false is returned
# otherwise false is returned
def
upvote?
def
upvote?
...
...
This diff is collapsed.
Click to expand it.
app/views/notes/_form.html.haml
View file @
5ad4be29
=
form_for
[
@project
,
@note
],
remote:
true
,
html:
{
multipart:
true
,
id:
nil
,
class:
"new_note js-new-note-form"
}
do
|
f
|
=
form_for
[
@project
,
@note
],
remote:
true
,
html:
{
multipart:
true
,
id:
nil
,
class:
"new_note js-new-note-form
common-note-form
"
}
do
|
f
|
=
note_target_fields
=
note_target_fields
=
f
.
hidden_field
:commit_id
=
f
.
hidden_field
:commit_id
...
@@ -26,15 +26,6 @@
...
@@ -26,15 +26,6 @@
%a
.btn.grouped.js-close-discussion-note-form
Cancel
%a
.btn.grouped.js-close-discussion-note-form
Cancel
.note-form-option
=
label_tag
:notify
do
=
check_box_tag
:notify
,
1
,
false
%span
.light
Notify team via email
.js-notify-commit-author
=
label_tag
:notify_author
do
=
check_box_tag
:notify_author
,
1
,
false
%span
.light
Notify commit author
.note-form-option
.note-form-option
%a
.choose-btn.btn.btn-small.js-choose-note-attachment-button
%a
.choose-btn.btn.btn-small.js-choose-note-attachment-button
%i
.icon-paper-clip
%i
.icon-paper-clip
...
...
This diff is collapsed.
Click to expand it.
app/views/walls/show.html.haml
View file @
5ad4be29
...
@@ -11,11 +11,6 @@
...
@@ -11,11 +11,6 @@
.buttons
.buttons
=
f
.
submit
'Add Comment'
,
class:
"btn comment-btn grouped js-comment-button"
=
f
.
submit
'Add Comment'
,
class:
"btn comment-btn grouped js-comment-button"
.note-form-option
=
label_tag
:notify
do
=
check_box_tag
:notify
,
1
,
false
%span
.light
Notify team via email
.note-form-option
.note-form-option
%a
.choose-btn.btn.btn-small.js-choose-note-attachment-button
%a
.choose-btn.btn.btn-small.js-choose-note-attachment-button
%i
.icon-paper-clip
%i
.icon-paper-clip
...
...
This diff is collapsed.
Click to expand it.
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