Merge branch 'master' into disable_rfcs

# Conflicts:
#	config/deploy.rb
This commit is contained in:
Ralf Teusner
2018-05-25 10:08:44 +02:00
2 changed files with 14 additions and 2 deletions

View File

@ -9,7 +9,9 @@ h1 = @exercise
= row(label: '.finishing_rate') do
p == @exercise.finishers.count ? "#{t('shared.out_of', maximum_value: @exercise.users.distinct.count, value: @exercise.finishers.count)} #{t('exercises.statistics.external_users')}" : empty
p = progress_bar((100.0 / @exercise.users.distinct.count * @exercise.finishers.count).round(2))
- finishers_count = @exercise.users.distinct.count
- finishers_percentage = finishers_count == 0 ? 0 : (100.0 / finishers_count * @exercise.finishers.count).round(2)
p = progress_bar(finishers_percentage)
= row(label: '.average_score') do
p == @exercise.average_score ? t('shared.out_of', maximum_value: @exercise.maximum_score, value: @exercise.average_score.round(2)) : empty

View File

@ -22,4 +22,14 @@ namespace :deploy do
end
end
end
end
task :create_whenever_log_dir do
on roles(:all) do
within release_path do
execute :mkdir, '-p', 'log/whenever'
end
end
end
end
after :deploy, 'deploy:create_whenever_log_dir'