Merge remote-tracking branch 'origin/master' into statistics

app/views/execution_environments/index.html.slim

@@ -6,6 +6,7 @@ h1 = ExecutionEnvironment.model_name.human(count: 2)
       tr
         th = t('activerecord.attributes.execution_environment.name')
         th = t('activerecord.attributes.execution_environment.user')
+        th = t('activerecord.attributes.execution_environment.pool_size')
         th = t('activerecord.attributes.execution_environment.memory_limit')
         th = t('activerecord.attributes.execution_environment.network_enabled')
         th = t('activerecord.attributes.execution_environment.permitted_execution_time')
@@ -16,6 +17,7 @@ h1 = ExecutionEnvironment.model_name.human(count: 2)
         tr
           td = execution_environment.name
           td = link_to(execution_environment.author, execution_environment.author)
+          td = execution_environment.pool_size
           td = execution_environment.memory_limit
           td = symbol_for(execution_environment.network_enabled)
           td = execution_environment.permitted_execution_time

app/views/exercises/implement.html.slim

@@ -4,7 +4,7 @@
 
     span.badge.pull-right.score
 
-    p.lead = @exercise.description
+    p.lead = render_markdown(@exercise.description)
 
     #alert.alert.alert-danger role='alert'
       h4 = t('.alert.title')

app/views/request_for_comments/show.html.erb

@@ -4,6 +4,14 @@
       <%
 
            user = @request_for_comment.user
+           submission_id =  self.class.connection.execute("select id from submissions
+           where exercise_id =
+           #{@request_for_comment.exercise_id} AND
+           user_id =  #{@request_for_comment.user_id} AND
+           #{@request_for_comment.user_id} > created_at
+           order by created_at desc
+           limit 1").first['id'].to_i
+           submission = Submission.find(submission_id)
 
       %>
     <%= user %> | <%= @request_for_comment.requested_at %>