diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-12 22:00:43 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-12 22:00:43 +0000 |
| commit | abfa6dcc43bc7d9e187ed5a7f882a44ca96ea6c0 (patch) | |
| tree | e014491076f1270e079195c64206a68d87e3dbc7 | |
| parent | 2505dc46e7fa34fc874a35691385bc8f3e56837e (diff) | |
| parent | 6a238c37e002c9d8dcc51af2cb3dff44c900139c (diff) | |
| download | gitlab-ce-abfa6dcc43bc7d9e187ed5a7f882a44ca96ea6c0.tar.gz | |
Merge branch 'fix-todo-target-path' into 'master'
Fix todo_target_path for todos where target was removed
Fixes #15187
See merge request !3684
| -rw-r--r-- | app/assets/javascripts/todos.js.coffee | 2 | ||||
| -rw-r--r-- | app/helpers/todos_helper.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/todos.js.coffee b/app/assets/javascripts/todos.js.coffee index 886da72e261..00d2b641723 100644 --- a/app/assets/javascripts/todos.js.coffee +++ b/app/assets/javascripts/todos.js.coffee @@ -59,6 +59,8 @@ class @Todos goToTodoUrl: (e)-> todoLink = $(this).data('url') + return unless todoLink + if e.metaKey e.preventDefault() window.open(todoLink,'_blank') diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index edc5686cf08..2f066682180 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -20,6 +20,8 @@ module TodosHelper end def todo_target_path(todo) + return unless todo.target.present? + anchor = dom_id(todo.note) if todo.note.present? if todo.for_commit? |