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
Léo-Paul Géneau
gitlab-ce
Commits
cb2287df
Commit
cb2287df
authored
Jun 09, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Notes bundle for the issue discussions refactor.
parent
f7344338
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
app/assets/javascripts/notes/index.js
app/assets/javascripts/notes/index.js
+8
-0
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+5
-0
config/webpack.config.js
config/webpack.config.js
+2
-0
No files found.
app/assets/javascripts/notes/index.js
0 → 100644
View file @
cb2287df
import
Vue
from
'
vue
'
;
import
Vuex
from
'
vuex
'
;
Vue
.
use
(
Vuex
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
// instantiate Vue here...
});
app/views/projects/issues/_discussion.html.haml
View file @
cb2287df
...
@@ -3,5 +3,10 @@
...
@@ -3,5 +3,10 @@
=
link_to
'Reopen issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
format:
'json'
),
data:
{
original_text:
"Reopen issue"
,
alternative_text:
"Comment & reopen issue"
},
class:
"btn btn-nr btn-reopen btn-comment js-note-target-reopen
#{
issue_button_visibility
(
@issue
,
false
)
}
"
,
title:
'Reopen issue'
=
link_to
'Reopen issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
format:
'json'
),
data:
{
original_text:
"Reopen issue"
,
alternative_text:
"Comment & reopen issue"
},
class:
"btn btn-nr btn-reopen btn-comment js-note-target-reopen
#{
issue_button_visibility
(
@issue
,
false
)
}
"
,
title:
'Reopen issue'
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
format:
'json'
),
data:
{
original_text:
"Close issue"
,
alternative_text:
"Comment & close issue"
},
class:
"btn btn-nr btn-close btn-comment js-note-target-close
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close issue'
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
format:
'json'
),
data:
{
original_text:
"Close issue"
,
alternative_text:
"Comment & close issue"
},
class:
"btn btn-nr btn-close btn-comment js-note-target-close
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close issue'
#js-notes
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'notes'
#notes
#notes
=
render
'shared/notes/notes_with_form'
,
:autocomplete
=>
true
=
render
'shared/notes/notes_with_form'
,
:autocomplete
=>
true
config/webpack.config.js
View file @
cb2287df
...
@@ -51,6 +51,7 @@ var config = {
...
@@ -51,6 +51,7 @@ var config = {
monitoring
:
'
./monitoring/monitoring_bundle.js
'
,
monitoring
:
'
./monitoring/monitoring_bundle.js
'
,
network
:
'
./network/network_bundle.js
'
,
network
:
'
./network/network_bundle.js
'
,
notebook_viewer
:
'
./blob/notebook_viewer.js
'
,
notebook_viewer
:
'
./blob/notebook_viewer.js
'
,
notes
:
'
./notes/index.js
'
,
pdf_viewer
:
'
./blob/pdf_viewer.js
'
,
pdf_viewer
:
'
./blob/pdf_viewer.js
'
,
pipelines
:
'
./pipelines/pipelines_bundle.js
'
,
pipelines
:
'
./pipelines/pipelines_bundle.js
'
,
pipelines_details
:
'
./pipelines/pipeline_details_bundle.js
'
,
pipelines_details
:
'
./pipelines/pipeline_details_bundle.js
'
,
...
@@ -166,6 +167,7 @@ var config = {
...
@@ -166,6 +167,7 @@ var config = {
'
merge_conflicts
'
,
'
merge_conflicts
'
,
'
monitoring
'
,
'
monitoring
'
,
'
notebook_viewer
'
,
'
notebook_viewer
'
,
'
notes
'
,
'
pdf_viewer
'
,
'
pdf_viewer
'
,
'
pipelines
'
,
'
pipelines
'
,
'
pipelines_details
'
,
'
pipelines_details
'
,
...
...
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