From: Michal Fojtik <[email protected]>
Signed-off-by: Michal fojtik <[email protected]> --- server/lib/sinatra/rack_accept.rb | 4 ---- server/lib/sinatra/rack_matrix_params.rb | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/server/lib/sinatra/rack_accept.rb b/server/lib/sinatra/rack_accept.rb index 2ad52c7..e4a0f1f 100644 --- a/server/lib/sinatra/rack_accept.rb +++ b/server/lib/sinatra/rack_accept.rb @@ -12,11 +12,8 @@ # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE -require 'sinatra/base' require 'rack/accept' -use Rack::Accept - module Rack module RespondTo @@ -26,7 +23,6 @@ module Rack # We need to overide the default render method to supply correct path to the # template, since Sinatra is by default looking in the current __FILE__ path def self.registered(app) - app.helpers Rack::RespondTo::Helpers app.class_eval do alias :render_without_format :render def render(*args, &block) diff --git a/server/lib/sinatra/rack_matrix_params.rb b/server/lib/sinatra/rack_matrix_params.rb index 177e745..0d9339b 100644 --- a/server/lib/sinatra/rack_matrix_params.rb +++ b/server/lib/sinatra/rack_matrix_params.rb @@ -51,9 +51,7 @@ module Rack while param=sub_components.pop do if value matrix_params[sub_components.first] ||= {} - matrix_params[sub_components.first].merge!( - param => value - ) + matrix_params[sub_components.first].merge!(param => value) value=nil next else -- 1.7.10
