home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix spinach

Browse Source
This commit is contained in:
Valery Sizov
2015-07-31 13:47:51 +03:00
parent 858737a1db
commit 5879bf07e4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/shared/issuable/_form.html.haml
+6 -5
View File
@@ -166,11 +166,12 @@
$(this).closest("li").remove()
return false
$("form.merge-request-form").submit ->
approver_ids = $.map $("li.project-approvers").not(".approver-template"), (li, i) ->
li.id.replace("user_", "")
approvers_input = $(this).find("input#merge_request_approver_ids")
approver_ids = approver_ids.concat(approvers_input.val().split(","))
approvers_input.val(_.compact(approver_ids).join(","))
if $("input#merge_request_approver_ids").length
approver_ids = $.map $("li.project-approvers").not(".approver-template"), (li, i) ->
li.id.replace("user_", "")
approvers_input = $(this).find("input#merge_request_approver_ids")
approver_ids = approver_ids.concat(approvers_input.val().split(","))
approvers_input.val(_.compact(approver_ids).join(","))
$(".suggested-approvers a").click ->
user_id = this.id.replace("user_", "")
user_name = this.text
features/steps/project/merge_requests.rb
+1
View File
@@ -325,6 +325,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I click the "Target branch" dropdown' do
sleep 0.5
first('.target_branch').click
end