[DRE-commits] [diaspora] 37/257: add manual requires in place of bundler/setup

[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 a417bbaafe828c5febd883cb7e1340f36600b292
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon May 5 10:33:45 2014 +0530

    add manual requires in place of bundler/setup
---
 .../add-manual-requires-skip-bundler-setup.patch   | 152 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 153 insertions(+)

diff --git a/debian/patches/add-manual-requires-skip-bundler-setup.patch b/debian/patches/add-manual-requires-skip-bundler-setup.patch
new file mode 100644
index 0000000..2e7db13
--- /dev/null
+++ b/debian/patches/add-manual-requires-skip-bundler-setup.patch
@@ -0,0 +1,152 @@
+--- a/config/boot.rb
++++ b/config/boot.rb
+@@ -1,11 +1,146 @@
+-require 'rubygems'
++#require 'rubygems'
+ 
+ # Set up gems listed in the Gemfile.
+-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
++#ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
++#require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+ 
+ # Ensure Builder is loaded
+ require 'active_support/builder' unless defined?(Builder)
+ 
+ # Load configuration early
+ require_relative 'load_config'
++
++require 'rails'
++
++# API and JSON
++
++require 'acts_as_api'
++require 'json'
++
++# Authentication
++
++require 'devise'
++
++# Captcha
++
++require 'simple_captcha'
++
++# Background processing
++
++require 'sidekiq'
++require 'sinatra'
++
++# Configuration
++
++require 'configurate'
++
++# Cross-origin resource sharing
++
++require 'rack/cors'
++
++# Database
++
++
++require 'mysql2'
++
++require 'activerecord-import'
++require 'foreigner'
++
++# File uploading
++
++require 'carrierwave'
++require 'fog'
++require 'mini_magick'
++require 'remotipart'
++
++# Localization
++
++require 'http_accept_language'
++require 'i18n-inflector-rails'
++require 'rails-i18n'
++
++# Mail
++
++require 'markerb'
++require 'messagebus_ruby_api'
++
++# Parsing
++
++require 'nokogiri'
++require 'rails_autolink'
++require 'redcarpet'
++require 'roxml'
++require 'ruby-oembed'
++require 'opengraph_parser'
++
++
++# Please remove when migrating to Rails 4
++require 'strong_parameters'
++
++
++# Services
++
++require 'omniauth'
++require 'omniauth-facebook'
++require 'omniauth-tumblr'
++require 'omniauth-twitter'
++require 'twitter'
++require 'omniauth-wordpres'
++
++# Tags
++
++require 'acts-as-taggable-on'
++
++# URIs and HTTP
++
++require 'addressable/uri'
++require 'faraday'
++require 'faraday_middleware'
++require 'typhoeus'
++
++# Views
++
++require 'client_side_validations'
++require 'gon'
++require 'haml'
++require 'mobile-fu'
++require 'will_paginate'
++
++# Workarounds
++# https://github.com/rubyzip/rubyzip#important-note
++require 'zip-zip'
++
++### GROUPS ####
++
++
++  # Icons
++require 'entypo-rails'
++
++  # CSS
++
++  require 'bootstrap-sass'
++  require 'compass-rails'
++  require 'sass-rails'
++
++  # Compression
++
++  require 'uglifier'
++
++  # JavaScript
++
++  require 'backbone-on-rails'
++  require 'handlebars_assets'
++  require 'jquery-rails'
++
++  # Analytics
++
++  require 'rack/google-analytics'
++  require 'rack/piwik'
++
++  # Click-jacking protection
++
++  require 'rack-protection'
++
++  # Redirects
++
++  require 'rack/ssl'
diff --git a/debian/patches/series b/debian/patches/series
index 246831c..b502dac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+add-manual-requires-skip-bundler-setup.patch
 remove-development-test-from-gemfile.patch
 remove-gemfile-lock.patch
 loosen-unicorn-version-dep.patch

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