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
20397091
Commit
20397091
authored
Aug 19, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show iid in event feed and uatocomplete as default id for issues, mr
parent
608f3286
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
app/assets/javascripts/gfm_auto_complete.js.coffee
app/assets/javascripts/gfm_auto_complete.js.coffee
+1
-1
app/models/event.rb
app/models/event.rb
+4
-0
app/views/events/event/_common.html.haml
app/views/events/event/_common.html.haml
+1
-1
config/routes.rb
config/routes.rb
+1
-1
No files found.
app/assets/javascripts/gfm_auto_complete.js.coffee
View file @
20397091
...
@@ -44,7 +44,7 @@ GitLab.GfmAutoComplete =
...
@@ -44,7 +44,7 @@ GitLab.GfmAutoComplete =
tpl
:
@
Issues
.
template
tpl
:
@
Issues
.
template
callbacks
:
callbacks
:
before_save
:
(
issues
)
->
before_save
:
(
issues
)
->
$
.
map
issues
,
(
i
)
->
id
:
i
.
i
d
,
title
:
sanitize
(
i
.
title
),
search
:
"
#{
i
.
id
}
#{
i
.
title
}
"
$
.
map
issues
,
(
i
)
->
id
:
i
.
i
id
,
title
:
sanitize
(
i
.
title
),
search
:
"
#{
i
.
i
id
}
#{
i
.
title
}
"
input
.
one
"focus"
,
=>
input
.
one
"focus"
,
=>
$
.
getJSON
(
@
dataSource
).
done
(
data
)
->
$
.
getJSON
(
@
dataSource
).
done
(
data
)
->
...
...
app/models/event.rb
View file @
20397091
...
@@ -256,6 +256,10 @@ class Event < ActiveRecord::Base
...
@@ -256,6 +256,10 @@ class Event < ActiveRecord::Base
target
.
commit_id
target
.
commit_id
end
end
def
target_iid
target
.
respond_to?
(
:iid
)
?
target
.
iid
:
target_id
end
def
note_short_commit_id
def
note_short_commit_id
note_commit_id
[
0
..
8
]
note_commit_id
[
0
..
8
]
end
end
...
...
app/views/events/event/_common.html.haml
View file @
20397091
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%span
.author_name
=
link_to_author
event
%span
.author_name
=
link_to_author
event
%span
.event_label
{
class:
event
.
action_name
}=
event_action_name
(
event
)
%span
.event_label
{
class:
event
.
action_name
}=
event_action_name
(
event
)
-
if
event
.
target
-
if
event
.
target
%strong
=
link_to
"#
#{
event
.
target_id
}
"
,
[
event
.
project
,
event
.
target
]
%strong
=
link_to
"#
#{
event
.
target_i
i
d
}
"
,
[
event
.
project
,
event
.
target
]
-
else
-
else
%strong
=
gfm
event
.
target_title
%strong
=
gfm
event
.
target_title
at
at
...
...
config/routes.rb
View file @
20397091
...
@@ -281,7 +281,7 @@ Gitlab::Application.routes.draw do
...
@@ -281,7 +281,7 @@ Gitlab::Application.routes.draw do
end
end
end
end
resources
:issues
,
except:
[
:destroy
]
do
resources
:issues
,
constraints:
{
id:
/\d+/
},
except:
[
:destroy
]
do
collection
do
collection
do
post
:bulk_update
post
:bulk_update
end
end
...
...
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