diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-06 14:03:41 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-06 14:08:40 +0100 |
| commit | be94e135524943236f85a63de08fa8ccc445a0af (patch) | |
| tree | 0af840bfe892b12ace286039c2cb8018885a3b5d | |
| parent | dc558eb24e7432570e1fdbd73c9d67551602c8dc (diff) | |
| download | gitlab-ce-be94e135524943236f85a63de08fa8ccc445a0af.tar.gz | |
Add assignee icon to milestone merge requests.
| -rw-r--r-- | app/assets/javascripts/milestone.js.coffee | 7 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/projects/milestones/_merge_request.html.haml | 3 |
3 files changed, 16 insertions, 0 deletions
diff --git a/app/assets/javascripts/milestone.js.coffee b/app/assets/javascripts/milestone.js.coffee index c42f31933d3..d644d50b669 100644 --- a/app/assets/javascripts/milestone.js.coffee +++ b/app/assets/javascripts/milestone.js.coffee @@ -49,6 +49,13 @@ class @Milestone data: data success: (data) -> if data.saved == true + if data.assignee_avatar_url + img_tag = $('<img/>') + img_tag.attr('src', data.assignee_avatar_url) + img_tag.addClass('avatar s16') + $(li).find('.assignee-icon').html(img_tag) + else + $(li).find('.assignee-icon').html('') $(li).effect 'highlight' else new Flash("Issue update failed", 'alert') diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 26d4c51773f..848cf367493 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -100,6 +100,12 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request.target_project, @merge_request], notice: 'Merge request was successfully updated.') end + format.json do + render json: { + saved: @merge_request.valid?, + assignee_avatar_url: @merge_request.assignee.try(:avatar_url) + } + end end else render "edit" diff --git a/app/views/projects/milestones/_merge_request.html.haml b/app/views/projects/milestones/_merge_request.html.haml index 46f2df1b183..42fbd0cd2ca 100644 --- a/app/views/projects/milestones/_merge_request.html.haml +++ b/app/views/projects/milestones/_merge_request.html.haml @@ -3,3 +3,6 @@ = link_to [@project.namespace.becomes(Namespace), @project, merge_request] do %span.cgray ##{merge_request.iid} = link_to_gfm merge_request.title, [@project.namespace.becomes(Namespace), @project, merge_request], title: merge_request.title + .pull-right.assignee-icon + - if merge_request.assignee + = image_tag avatar_icon(merge_request.assignee.email, 16), class: "avatar s16" |