[DRE-commits] [diaspora] 124/257: update require lines in boot.rb

[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 6ea82b03852924f7085cbd1fb9725a621bf6e684
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Nov 22 18:37:54 2014 +0530

    update require lines in boot.rb
---
 ...01-add-manual-requires-skip-bundler-setup.patch | 83 +++++++++++++---------
 1 file changed, 49 insertions(+), 34 deletions(-)

diff --git a/debian/patches/001-add-manual-requires-skip-bundler-setup.patch b/debian/patches/001-add-manual-requires-skip-bundler-setup.patch
index c237d7b..7ff3491 100644
--- a/debian/patches/001-add-manual-requires-skip-bundler-setup.patch
+++ b/debian/patches/001-add-manual-requires-skip-bundler-setup.patch
@@ -2,7 +2,7 @@ Index: diaspora/config/boot.rb
 ===================================================================
 --- diaspora.orig/config/boot.rb
 +++ diaspora/config/boot.rb
-@@ -1,9 +1,148 @@
+@@ -1,9 +1,163 @@
 +#require 'rubygems'
 +
  # Set up gems listed in the Gemfile.
@@ -29,16 +29,26 @@ Index: diaspora/config/boot.rb
 +# Authentication
 +
 +require 'devise'
++require 'devise_lastseenable'
 +
 +# Captcha
 +
-+require 'simple_captcha'
++require 'simple_captcha2'
 +
 +# Background processing
 +
 +require 'sidekiq'
 +require 'sinatra'
 +
++# Scheduled processing
++
++require 'sidetiq'
++
++# Compression
++
++require 'uglifier'
++
++
 +# Configuration
 +
 +require 'configurate'
@@ -47,10 +57,16 @@ Index: diaspora/config/boot.rb
 +
 +require 'rack/cors'
 +
-+# Database
++# CSS
++
++require 'bootstrap-sass'
++require 'compass-rails'
++require 'sass-rails'
++
 +
++# Database
 +
-+require 'mysql2'
++require 'pg'
 +
 +require 'activerecord-import'
 +require 'foreigner'
@@ -62,6 +78,32 @@ Index: diaspora/config/boot.rb
 +require 'mini_magick'
 +require 'remotipart'
 +
++# GUID generation
++
++require 'uuid'
++
++# Icons
++
++require 'entypo-rails'
++
++# JavaScript
++
++require 'backbone-on-rails'
++require 'handlebars_assets'
++require 'jquery-rails'
++require 'rails-assets-jquery' # Should be kept in sync with jquery-rails
++require 'js_image_paths'
++require 'js-routes'
++require 'rails-assets-punycode'
++
++# jQuery plugins
++
++require 'rails-assets-jeresig--jquery.hotkeys'
++require 'rails-assets-jquery-idletimer'
++require 'rails-assets-jquery-placeholder'
++require 'rails-assets-jquery-textchange'
++require 'rails-assets-perfect-scrollbar'
++
 +# Localization
 +
 +require 'http_accept_language'
@@ -76,17 +118,12 @@ Index: diaspora/config/boot.rb
 +# Parsing
 +
 +require 'nokogiri'
-+require 'rails_autolink'
 +require 'redcarpet'
++require 'twitter-text'
 +require 'roxml'
-+#require 'ruby-oembed'
++require 'ruby-oembed'
 +require 'opengraph_parser'
 +
-+
-+# Please remove when migrating to Rails 4
-+require 'strong_parameters'
-+
-+
 +# Services
 +
 +require 'omniauth'
@@ -109,38 +146,16 @@ Index: diaspora/config/boot.rb
 +
 +# Views
 +
-+require 'client_side_validations'
 +require 'gon'
 +require 'haml'
 +require 'mobile-fu'
 +require 'will_paginate'
++require 'rails-timeago'
 +
 +# 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'

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