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
b050b681
Commit
b050b681
authored
May 24, 2017
by
Kushal Pandya
Committed by
Phil Hughes
May 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix user and issues autocomplete in diff notes
parent
b39b02d4
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
6 deletions
+6
-6
app/views/projects/commit/show.html.haml
app/views/projects/commit/show.html.haml
+1
-1
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+1
-1
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+1
-1
app/views/projects/snippets/show.html.haml
app/views/projects/snippets/show.html.haml
+1
-1
app/views/shared/notes/_notes_with_form.html.haml
app/views/shared/notes/_notes_with_form.html.haml
+1
-1
app/views/snippets/show.html.haml
app/views/snippets/show.html.haml
+1
-1
No files found.
app/views/projects/commit/show.html.haml
View file @
b050b681
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
.block-connector
.block-connector
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
=
render
"shared/notes/notes_with_form"
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
true
-
if
can_collaborate_with_project?
-
if
can_collaborate_with_project?
-
%w(revert cherry-pick)
.
each
do
|
type
|
-
%w(revert cherry-pick)
.
each
do
|
type
|
=
render
"projects/commit/change"
,
type:
type
,
commit:
@commit
,
title:
@commit
.
title
=
render
"projects/commit/change"
,
type:
type
,
commit:
@commit
,
title:
@commit
.
title
app/views/projects/issues/_discussion.html.haml
View file @
b050b681
...
@@ -4,4 +4,4 @@
...
@@ -4,4 +4,4 @@
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
format:
'json'
),
data:
{
no_turbolink:
true
,
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:
{
no_turbolink:
true
,
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'
#notes
#notes
=
render
'shared/notes/notes_with_form'
=
render
'shared/notes/notes_with_form'
,
:autocomplete
=>
true
app/views/projects/merge_requests/_discussion.html.haml
View file @
b050b681
...
@@ -8,4 +8,4 @@
...
@@ -8,4 +8,4 @@
%button
.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button
{
"v-if"
=>
"showButton"
,
type:
"submit"
,
data:
{
project_path:
"#{project_path(@merge_request.project)}"
}
}
%button
.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button
{
"v-if"
=>
"showButton"
,
type:
"submit"
,
data:
{
project_path:
"#{project_path(@merge_request.project)}"
}
}
{{ buttonText }}
{{ buttonText }}
#notes
=
render
"shared/notes/notes_with_form"
#notes
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
true
app/views/projects/snippets/show.html.haml
View file @
b050b681
...
@@ -9,4 +9,4 @@
...
@@ -9,4 +9,4 @@
.row-content-block.top-block.content-component-block
.row-content-block.top-block.content-component-block
=
render
'award_emoji/awards_block'
,
awardable:
@snippet
,
inline:
true
=
render
'award_emoji/awards_block'
,
awardable:
@snippet
,
inline:
true
#notes
=
render
"shared/notes/notes_with_form"
#notes
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
true
app/views/shared/notes/_notes_with_form.html.haml
View file @
b050b681
...
@@ -23,4 +23,4 @@
...
@@ -23,4 +23,4 @@
to post a comment
to post a comment
:javascript
:javascript
var
notes
=
new
Notes
(
"
#{
notes_url
}
"
,
#{
@notes
.
map
(
&
:id
).
to_json
}
,
#{
Time
.
now
.
to_i
}
,
"
#{
diff_view
}
"
,
false
)
var
notes
=
new
Notes
(
"
#{
notes_url
}
"
,
#{
@notes
.
map
(
&
:id
).
to_json
}
,
#{
Time
.
now
.
to_i
}
,
"
#{
diff_view
}
"
,
#{
autocomplete
}
)
app/views/snippets/show.html.haml
View file @
b050b681
...
@@ -9,4 +9,4 @@
...
@@ -9,4 +9,4 @@
.row-content-block.top-block.content-component-block
.row-content-block.top-block.content-component-block
=
render
'award_emoji/awards_block'
,
awardable:
@snippet
,
inline:
true
=
render
'award_emoji/awards_block'
,
awardable:
@snippet
,
inline:
true
#notes
=
render
"shared/notes/notes_with_form"
#notes
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
false
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