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
c1d070cf
Commit
c1d070cf
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6475 from tsigo/merge-request-autocomplete
Add GFM autocompletion for MergeRequests
parents
4c132ed4
1688a290
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
app/assets/javascripts/gfm_auto_complete.js.coffee
app/assets/javascripts/gfm_auto_complete.js.coffee
+12
-0
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-0
No files found.
app/assets/javascripts/gfm_auto_complete.js.coffee
View file @
c1d070cf
...
...
@@ -13,6 +13,7 @@ GitLab.GfmAutoComplete =
Members
:
template
:
'<li data-value="${username}">${username} <small>${name}</small></li>'
# Issues and MergeRequests
Issues
:
template
:
'<li data-value="${id}"><small>${id}</small> ${title} </li>'
...
...
@@ -46,11 +47,22 @@ GitLab.GfmAutoComplete =
before_save
:
(
issues
)
->
$
.
map
issues
,
(
i
)
->
id
:
i
.
iid
,
title
:
sanitize
(
i
.
title
),
search
:
"
#{
i
.
iid
}
#{
i
.
title
}
"
input
.
atwho
at
:
'!'
alias
:
'mergerequests'
search_key
:
'search'
tpl
:
@
Issues
.
template
callbacks
:
before_save
:
(
merges
)
->
$
.
map
merges
,
(
m
)
->
id
:
m
.
iid
,
title
:
sanitize
(
m
.
title
),
search
:
"
#{
m
.
iid
}
#{
m
.
title
}
"
input
.
one
"focus"
,
=>
$
.
getJSON
(
@
dataSource
).
done
(
data
)
->
# load members
input
.
atwho
'load'
,
"@"
,
data
.
members
# load issues
input
.
atwho
'load'
,
"issues"
,
data
.
issues
# load merge requests
input
.
atwho
'load'
,
"mergerequests"
,
data
.
mergerequests
# load emojis
input
.
atwho
'load'
,
":"
,
data
.
emojis
This diff is collapsed.
Click to expand it.
app/controllers/projects_controller.rb
View file @
c1d070cf
...
...
@@ -108,6 +108,7 @@ class ProjectsController < ApplicationController
@suggestions
=
{
emojis:
Emoji
.
names
,
issues:
@project
.
issues
.
select
([
:iid
,
:title
,
:description
]),
mergerequests:
@project
.
merge_requests
.
select
([
:iid
,
:title
,
:description
]),
members:
@project
.
team
.
members
.
sort_by
(
&
:username
).
map
{
|
user
|
{
username:
user
.
username
,
name:
user
.
name
}
}
}
...
...
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