Skip to content
Snippets Groups Projects
Commit 20397091 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Show iid in event feed and uatocomplete as default id for issues, mr

parent 608f3286
No related branches found
No related tags found
1 merge request!5081fixed command to update init script
Loading
Loading
@@ -44,7 +44,7 @@ GitLab.GfmAutoComplete =
tpl: @Issues.template
callbacks:
before_save: (issues) ->
$.map issues, (i) -> id: i.id, title: sanitize(i.title), search: "#{i.id} #{i.title}"
$.map issues, (i) -> id: i.iid, title: sanitize(i.title), search: "#{i.iid} #{i.title}"
 
input.one "focus", =>
$.getJSON(@dataSource).done (data) ->
Loading
Loading
Loading
Loading
@@ -256,6 +256,10 @@ class Event < ActiveRecord::Base
target.commit_id
end
 
def target_iid
target.respond_to?(:iid) ? target.iid : target_id
end
def note_short_commit_id
note_commit_id[0..8]
end
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@
%span.author_name= link_to_author event
%span.event_label{class: event.action_name}= event_action_name(event)
- if event.target
%strong= link_to "##{event.target_id}", [event.project, event.target]
%strong= link_to "##{event.target_iid}", [event.project, event.target]
- else
%strong= gfm event.target_title
at
Loading
Loading
Loading
Loading
@@ -281,7 +281,7 @@ Gitlab::Application.routes.draw do
end
end
 
resources :issues, except: [:destroy] do
resources :issues, constraints: {id: /\d+/}, except: [:destroy] do
collection do
post :bulk_update
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment