pre-merge

2 files changed, 85 insertions, 86 deletions

diff --git a/config/initializers/mailboxer.rb b/config/initializers/mailboxer.rb
index 2778a10..b529481 100644
--- a/config/initializers/mailboxer.rb
+++ b/config/initializers/mailboxer.rb
@@ -1,17 +1,17 @@
 Mailboxer.setup do |config|
 
-  #Configures if you applications uses or no the email sending for Notifications and Messages
-  config.uses_emails = false
+	#Configures if you applications uses or no the email sending for Notifications and Messages
+	config.uses_emails = false
 
-  #Configures the default from for the email sent for Messages and Notifications of Mailboxer
-  config.default_from = "no-reply@mailboxer.com"
+	#Configures the default from for the email sent for Messages and Notifications of Mailboxer
+	config.default_from = "no-reply@mailboxer.com"
 
-  #Configures the methods needed by mailboxer
-  config.email_method = :mailboxer_email
-  config.name_method = :name
+	#Configures the methods needed by mailboxer
+	config.email_method = :mailboxer_email
+	config.name_method = :name
 
-  #Configures if you use or not a search engine and wich one are you using
-  #Supported enignes: [:solr,:sphinx]
-  config.search_enabled = false
-  config.search_engine = :solr
+	#Configures if you use or not a search engine and wich one are you using
+	#Supported enignes: [:solr,:sphinx]
+	config.search_enabled = false
+	config.search_engine = :solr
 end
diff --git a/config/routes.rb b/config/routes.rb
index c1bbf52..97cc5c4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,99 +1,98 @@
-# -*- Mode: Ruby; Ruby-indent-level: 2; Indent-tabs-mode: nil -*-
 Leaguer::Application.routes.draw do
 
-  resources :brackets
+	resources :brackets
 
-  resources :sessions, only: [:new, :create, :destroy]
+	resources :sessions, only: [:new, :create, :destroy]
 
-  resources :users
+	resources :users
 
-  resources :games
+	resources :games
 
-  resources :pms
+	resources :pms
 
-  resources :alerts
+	resources :alerts
 
-  resource :server, only: [:show, :edit, :update]
+	resource :server, only: [:show, :edit, :update]
 
-  #match 'simple_captcha/:id', :to => 'simple_captcha#show', :as => :simple_captcha
+	#match 'simple_captcha/:id', :to => 'simple_captcha#show', :as => :simple_captcha
 
-  resources :teams
+	resources :teams
 
-  resources :tournaments do
-    resources :matches, only: [:index, :show, :update]
-  end
+	resources :tournaments do
+		resources :matches, only: [:index, :show, :update]
+	end
 
-  root to: 'static#homepage'
+	root to: 'static#homepage'
 
-  get '/testsvg', to: 'static#test'
+	get '/testsvg', to: 'static#test'
 
-  get '/search', to: 'search#go'
+	get '/search', to: 'search#go'
 
 end
 
 
 Leaguer::Application.routes.named_routes.module.module_eval do
-  def match_path(match, options={})
-    tournament_match_path(match.tournament_stage.tournament, match, options)
+	def match_path(match, options={})
+		tournament_match_path(match.tournament_stage.tournament, match, options)
     end
-  def match_url(match, options={})
-    tournament_match_url(match.tournament_stage.tournament, match, options)
-  end
+	def match_url(match, options={})
+		tournament_match_url(match.tournament_stage.tournament, match, options)
+	end
 end
 
 if false
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
+	# The priority is based upon order of creation: first created -> highest priority.
+	# See how all your routes lay out with "rake routes".
+
+	# You can have the root of your site routed with "root"
+	# root 'welcome#index'
+
+	# Example of regular route:
+	#   get 'products/:id' => 'catalog#view'
+
+	# Example of named route that can be invoked with purchase_url(id: product.id)
+	#   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
+
+	# Example resource route (maps HTTP verbs to controller actions automatically):
+	#   resources :products
+
+	# Example resource route with options:
+	#   resources :products do
+	#     member do
+	#       get 'short'
+	#       post 'toggle'
+	#     end
+	#
+	#     collection do
+	#       get 'sold'
+	#     end
+	#   end
+
+	# Example resource route with sub-resources:
+	#   resources :products do
+	#     resources :comments, :sales
+	#     resource :seller
+	#   end
+
+	# Example resource route with more complex sub-resources:
+	#   resources :products do
+	#     resources :comments
+	#     resources :sales do
+	#       get 'recent', on: :collection
+	#     end
+	#   end
+
+	# Example resource route with concerns:
+	#   concern :toggleable do
+	#     post 'toggle'
+	#   end
+	#   resources :posts, concerns: :toggleable
+	#   resources :photos, concerns: :toggleable
+
+	# Example resource route within a namespace:
+	#   namespace :admin do
+	#     # Directs /admin/products/* to Admin::ProductsController
+	#     # (app/controllers/admin/products_controller.rb)
+	#     resources :products
+	#   end
 end