From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 18 Sep 2014 14:14:49 +0000 (+0200)
Subject: Fix bundler killer patch II. - passenger not needed (and it's named phusion_passenger... 
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d845d0c94124616349f336b0e68ca6a3f781e46f;p=rOCCI-packaging-fedora.git

Fix bundler killer patch II. - passenger not needed (and it's named phusion_passenger anyway).
---

diff --git a/rocci-server-unbundle.diff b/rocci-server-unbundle.diff
index 8d4000d..cc96e0a 100644
--- a/rocci-server-unbundle.diff
+++ b/rocci-server-unbundle.diff
@@ -1,10 +1,10 @@
 Author: František Dvořák <valtri@civ.zcu.cz>
-Date:   Thu Sep 18 00:47:31 2014 +0200
+Date:   Thu Sep 18 16:10:01 2014 +0200
 
-    Remove bundler.
+    Remove the bundler.
 
 diff --git a/config/application.rb b/config/application.rb
-index 98480fb..268b1ca 100644
+index 98480fb..e768d67 100644
 --- a/config/application.rb
 +++ b/config/application.rb
 @@ -8,9 +8,30 @@ require 'action_controller/railtie'
@@ -14,11 +14,11 @@ index 98480fb..268b1ca 100644
 -# Require the gems listed in Gemfile, including any gems
 -# you've limited to :test, :development, or :production.
 -Bundler.require(:default, Rails.env)
++# Gemfile requires
 +require 'rails'
 +require 'rails-api'
 +require 'jbuilder'
 +require 'rack/cors'
-+require 'passenger'
 +require 'dalli'
 +require 'kgio'
 +require 'warden'