Commit 7748f651beda3adc116105f6efaba39e2b3ed822

speling fix

Commit diff

app/controllers/merge_requests_controller.rb

 
2626 @merge_request = @repository.proposed_merge_requests.new(params[:merge_request])
2727 @merge_request.user = current_user
2828 if @merge_request.save
29 flash[:success] = "Your sent a merge request to #{@merge_request.target_repository.name}"
29 flash[:success] = %Q{You sent a merge request to "#{@merge_request.target_repository.name}"}
3030 redirect_to project_repository_path(@project, @repository) and return
3131 else
3232 @repositories = @project.repositories.find(:all, :conditions => ["id != ?", @repository.id])
toggle raw diff

spec/controllers/merge_requests_controller_spec.rb

 
128128 proc {
129129 do_post
130130 response.should redirect_to(project_repository_path(@project, @repository))
131 flash[:success].should match(/sent a merge request to #{repositories(:johans2).name}/i)
131 flash[:success].should match(/sent a merge request to "#{repositories(:johans2).name}"/i)
132132 }.should change(MergeRequest, :count)
133133 end
134134
toggle raw diff