Merge branch 'master' of https://github.com/LukeShu/leaguer

2 files changed, 23 insertions, 0 deletions

diff --git a/config/initializers/mailboxer.rb b/config/initializers/mailboxer.rb
new file mode 100644
index 0000000..2778a10
--- /dev/null
+++ b/config/initializers/mailboxer.rb
@@ -0,0 +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 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 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 f94bd2f..c1bbf52 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,8 +24,14 @@ Leaguer::Application.routes.draw do
   end
 
   root to: 'static#homepage'
+
   get '/testsvg', to: 'static#test'
+
+  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)