diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-12 12:23:42 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:46:38 -0400 |
| commit | 0ef055a4aef76d20668a40717fb33bfe41599cfb (patch) | |
| tree | caa845c06e1b0c61dce3038474383696ad2ea691 /app/views | |
| parent | 09112dbb1df2669b0042d6d785a5469a9855ac20 (diff) | |
| download | gitlab-ce-0ef055a4aef76d20668a40717fb33bfe41599cfb.tar.gz | |
MR on fork: Email fixes, style fixes
-Removed many extra spaces I added
-Fixed email templates to be consistent/better looking
GITLAB-894, GITLAB-895, (GITLAB-858)
Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
Diffstat (limited to 'app/views')
5 files changed, 8 insertions, 12 deletions
diff --git a/app/views/merge_requests/update_branches.js.haml b/app/views/merge_requests/update_branches.js.haml index c9171622669..7324aa89a5e 100644 --- a/app/views/merge_requests/update_branches.js.haml +++ b/app/views/merge_requests/update_branches.js.haml @@ -1,8 +1,4 @@ :plain $(".target_branch").html("#{escape_javascript(options_for_select(@target_branches))}"); $(".target_branch").trigger("liszt:updated"); - $(".mr_target_commit").html(""); - - - - + $(".mr_target_commit").html("");
\ No newline at end of file diff --git a/app/views/notify/closed_merge_request_email.text.haml b/app/views/notify/closed_merge_request_email.text.haml index 1c92e004ff6..7cf066339c3 100644 --- a/app/views/notify/closed_merge_request_email.text.haml +++ b/app/views/notify/closed_merge_request_email.text.haml @@ -2,7 +2,7 @@ Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} -Project:Branches: #{@merge_request.source_project.path_with_namespace}/#{@merge_request.source_branch} - #{@merge_request.target_project.path_with_namespace}#{@merge_request.target_branch} +Project:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} to #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch} Author: #{@merge_request.author_name} Assignee: #{@merge_request.assignee_name} diff --git a/app/views/notify/merged_merge_request_email.text.haml b/app/views/notify/merged_merge_request_email.text.haml index 5f19473fae0..ca18d8f30e5 100644 --- a/app/views/notify/merged_merge_request_email.text.haml +++ b/app/views/notify/merged_merge_request_email.text.haml @@ -2,7 +2,7 @@ Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} -Project:Branches: #{@merge_request.source_project.path_with_namespace}/#{@merge_request.source_branch} - #{@merge_request.target_project.path_with_namespace}#{@merge_request.target_branch} +Project:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} to #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch} Author: #{@merge_request.author_name} Assignee: #{@merge_request.assignee_name} diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml index fc4ffba1102..72546e00b15 100644 --- a/app/views/notify/new_merge_request_email.html.haml +++ b/app/views/notify/new_merge_request_email.html.haml @@ -3,7 +3,7 @@ %p = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request) %p - Project:Branches: #{@merge_request.source_project.path_with_namespace}/#{@merge_request.source_branch} - #{@merge_request.target_project.path_with_namespace}#{@merge_request.target_branch} + Project:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} → #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch} %p Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index 558c17eb0f6..7d43dc93eea 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -71,12 +71,12 @@ $.get("#{branch_from_project_merge_requests_path(@source_project)}", {ref: source_branch.val() }); $.get("#{branch_to_project_merge_requests_path(@source_project)}", {target_project_id: target_project.val(),ref: target_branch.val() }); - target_project.live("change", function() { + target_project.on("change", function() { $.get("#{update_branches_project_merge_requests_path(@source_project)}", {target_project_id: $(this).val() }); }); - source_branch.live("change", function() { + source_branch.on("change", function() { $.get("#{branch_from_project_merge_requests_path(@source_project)}", {ref: $(this).val() }); }); - target_branch.live("change", function() { + target_branch.on("change", function() { $.get("#{branch_to_project_merge_requests_path(@source_project)}", {target_project_id: target_project.val(),ref: $(this).val() }); - });
\ No newline at end of file + }); |