diff --git a/Gemfile b/Gemfile index 28f7000..638c83e 100644 --- a/Gemfile +++ b/Gemfile @@ -54,6 +54,7 @@ gem 'spring', :group => :development gem 'rb-readline' gem 'delayed_job_active_record' gem 'puma' + gem 'postmark-rails' group :development do #gem 'bullet' diff --git a/Gemfile.lock b/Gemfile.lock index 09a18f9..973a2e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,6 +91,12 @@ GEM passenger (5.0.7) rack rake (>= 0.8.1) + postmark (1.7.0) + json + rake + postmark-rails (0.12.0) + actionmailer (>= 3.0.0) + postmark (~> 1.7.0) puma (2.11.2) rack (>= 1.1, < 2.0) rack (1.6.4) @@ -174,6 +180,7 @@ DEPENDENCIES mysql2 newrelic_rpm passenger + postmark-rails puma rails (= 4.2.5) rails_12factor diff --git a/app/models/generates_tournament_matches.rb b/app/models/generates_tournament_matches.rb index e2dc649..d1e50b4 100644 --- a/app/models/generates_tournament_matches.rb +++ b/app/models/generates_tournament_matches.rb @@ -6,7 +6,7 @@ module GeneratesTournamentMatches end if Rails.env.production? handle_asynchronously :generateMatchups - end + end def poolToBracket resetSchoolScores diff --git a/config/application.rb b/config/application.rb index 9fb08b3..4169a4b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,7 +26,11 @@ module Wrestling config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) #gzip assets config.middleware.use Rack::Deflater + config.active_job.queue_adapter = :delayed_job + + config.action_mailer.delivery_method = :postmark + config.action_mailer.postmark_settings = { :api_token => ENV['POSTMARK_API_TOKEN'] } end