From 2390ae6a09f4cc809f549e1865cd6abf244a7db7 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 22 Feb 2013 22:36:48 +0100
Subject: [PATCH] Don't shadow options method in set_config

---
 lib/travis/web/app.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/travis/web/app.rb b/lib/travis/web/app.rb
index 31466a28..da5f475b 100644
--- a/lib/travis/web/app.rb
+++ b/lib/travis/web/app.rb
@@ -156,14 +156,14 @@ class Travis::Web::App
       Rack::Mime.mime_type File.extname(file)
     end
 
-    def set_config(string, options = {})
+    def set_config(string, opts = {})
       string.gsub! %r(<meta (rel|name)="travis\.([^"]*)" (href|value)="([^"]*)"[^>]*>) do
         %(<meta #{$1}="travis.#{$2}" #{$3}="#{options[$2.to_sym] || $4}">)
       end
 
       string.gsub! %r{(src|href)="(?:\/?)((styles|scripts)\/[^"]*)"} do
-        if options[:custom_branch]
-          url = "https://s3.amazonaws.com/travis-web-production/assets/#{options[:custom_branch]}/#{$2}"
+        if opts[:custom_branch]
+          url = "https://s3.amazonaws.com/travis-web-production/assets/#{opts[:custom_branch]}/#{$2}"
           %(#$1="#{url}")
         else
           %(#$1="/#{version}/#$2")