htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Maximilian Grundke
2015-11-19 16:01:53 +01:00
parent df1a77b665 98a5cd618c
commit 41b2c80b39
8 changed files with 76 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/execution_environments/index.html.slim
View File

@ -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