[DRE-commits] [diaspora] 38/257: update patch with more require lines

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit dabac43211e2778c6106a256b5d3817e9f0a8582
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue May 6 12:26:14 2014 +0530

    update patch with more require lines
---
 .../patches/add-manual-requires-skip-bundler-setup.patch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/patches/add-manual-requires-skip-bundler-setup.patch b/debian/patches/add-manual-requires-skip-bundler-setup.patch
index 2e7db13..5cbec97 100644
--- a/debian/patches/add-manual-requires-skip-bundler-setup.patch
+++ b/debian/patches/add-manual-requires-skip-bundler-setup.patch
@@ -1,6 +1,6 @@
 --- a/config/boot.rb
 +++ b/config/boot.rb
-@@ -1,11 +1,146 @@
+@@ -1,11 +1,148 @@
 -require 'rubygems'
 +#require 'rubygems'
  
@@ -17,6 +17,8 @@
  require_relative 'load_config'
 +
 +require 'rails'
++require 'active_record'
++require 'action_view'
 +
 +# API and JSON
 +
@@ -76,7 +78,7 @@
 +require 'rails_autolink'
 +require 'redcarpet'
 +require 'roxml'
-+require 'ruby-oembed'
++#require 'ruby-oembed'
 +require 'opengraph_parser'
 +
 +
@@ -91,7 +93,7 @@
 +require 'omniauth-tumblr'
 +require 'omniauth-twitter'
 +require 'twitter'
-+require 'omniauth-wordpres'
++require 'omniauth-wordpress'
 +
 +# Tags
 +
@@ -114,7 +116,7 @@
 +
 +# Workarounds
 +# https://github.com/rubyzip/rubyzip#important-note
-+require 'zip-zip'
++require 'zip/zip'
 +
 +### GROUPS ####
 +
@@ -124,9 +126,9 @@
 +
 +  # CSS
 +
-+  require 'bootstrap-sass'
-+  require 'compass-rails'
-+  require 'sass-rails'
++ # require 'bootstrap-sass'
++ # require 'compass-rails'
++ # require 'sass-rails'
 +
 +  # Compression
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git