summaryrefslogtreecommitdiff
path: root/spec/controllers/merge_requests_controller_spec.rb
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-12 19:32:58 +0100
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-12 19:32:58 +0100
commit940a402b6e015cde1b3513808cb9ac7f0a3bec8c (patch)
tree966b485d6bcb8737c24d4224618a7bc61d9cbf0e /spec/controllers/merge_requests_controller_spec.rb
parent0c4a70a306b871899bf87ce4673918abfee4d95f (diff)
downloadgitlab-ce-940a402b6e015cde1b3513808cb9ac7f0a3bec8c.tar.gz
Fixed hound warnings
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'spec/controllers/merge_requests_controller_spec.rb')
-rw-r--r--spec/controllers/merge_requests_controller_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/merge_requests_controller_spec.rb b/spec/controllers/merge_requests_controller_spec.rb
index fde34e480bf..eedaf17941a 100644
--- a/spec/controllers/merge_requests_controller_spec.rb
+++ b/spec/controllers/merge_requests_controller_spec.rb
@@ -31,7 +31,8 @@ describe Projects::MergeRequestsController do
end
it "should not escape Html" do
- allow_any_instance_of(MergeRequest).to receive(:"to_#{format}").and_return('HTML entities &<>" ')
+ allow_any_instance_of(MergeRequest).to receive(:"to_#{format}").
+ and_return('HTML entities &<>" ')
get :show, project_id: project.to_param, id: merge_request.iid, format: format