Description:
merge
Commit status:
[Not Reviewed]
References:
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment

r832:b5dca9c6565b - - 2 files changed: 4 inserted, 8 deleted

@@ -62,51 +62,48
62 62 actionpack (>= 3.2)
63 63 railties (>= 3.2)
64 64 bindex (0.7.0)
65 65 bootsnap (1.4.4)
66 66 msgpack (~> 1.0)
67 67 bootstrap-datepicker-rails (1.8.0.1)
68 68 railties (>= 3.0)
69 69 bootstrap-sass (3.4.1)
70 70 autoprefixer-rails (>= 5.2.1)
71 71 sassc (>= 2.0.0)
72 72 bootstrap-switch-rails (3.3.4)
73 73 bootstrap-toggle-rails (2.2.1.0)
74 74 bootstrap3-datetimepicker-rails (4.17.47)
75 75 momentjs-rails (>= 2.8.1)
76 76 builder (3.2.3)
77 77 byebug (11.0.1)
78 78 capybara (3.25.0)
79 79 addressable
80 80 mini_mime (>= 0.1.3)
81 81 nokogiri (~> 1.8)
82 82 rack (>= 1.6.0)
83 83 rack-test (>= 0.6.3)
84 84 regexp_parser (~> 1.5)
85 85 xpath (~> 3.2)
86 - capybara-console (0.0.4)
87 - capybara
88 - rails (>= 3.0)
89 86 childprocess (1.0.1)
90 87 rake (< 13.0)
91 88 coffee-rails (4.2.2)
92 89 coffee-script (>= 2.2.0)
93 90 railties (>= 4.0.0)
94 91 coffee-script (2.4.1)
95 92 coffee-script-source
96 93 execjs
97 94 coffee-script-source (1.12.2)
98 95 concurrent-ruby (1.1.5)
99 96 crass (1.0.4)
100 97 dynamic_form (1.1.4)
101 98 erubi (1.8.0)
102 99 erubis (2.7.0)
103 100 execjs (2.7.0)
104 101 ffi (1.11.1)
105 102 fuzzy-string-match (1.0.1)
106 103 RubyInline (>= 3.8.6)
107 104 globalid (0.4.2)
108 105 activesupport (>= 4.2.0)
109 106 haml (5.1.0)
110 107 temple (>= 0.8.0)
111 108 tilt
112 109 haml-rails (1.0.0)
@@ -278,49 +275,48
278 275 websocket-extensions (0.1.4)
279 276 will_paginate (3.0.12)
280 277 xpath (3.2.0)
281 278 nokogiri (~> 1.8)
282 279 yaml_db (0.7.0)
283 280 rails (>= 3.0)
284 281 rake (>= 0.8.7)
285 282
286 283 PLATFORMS
287 284 ruby
288 285
289 286 DEPENDENCIES
290 287 ace-rails-ap
291 288 activerecord-session_store
292 289 autoprefixer-rails
293 290 best_in_place (~> 3.0.1)
294 291 bootsnap (>= 1.1.0)
295 292 bootstrap-datepicker-rails
296 293 bootstrap-sass (~> 3.4.1)
297 294 bootstrap-switch-rails
298 295 bootstrap-toggle-rails
299 296 bootstrap3-datetimepicker-rails
300 297 byebug
301 298 capybara (>= 2.15)
302 - capybara-console
303 299 coffee-rails
304 300 dynamic_form
305 301 fuzzy-string-match
306 302 haml
307 303 haml-rails
308 304 in_place_editing
309 305 jbuilder (~> 2.5)
310 306 jquery-countdown-rails
311 307 jquery-datatables-rails
312 308 jquery-rails
313 309 jquery-tablesorter
314 310 jquery-timepicker-addon-rails
315 311 jquery-ui-rails
316 312 listen (>= 3.0.5, < 3.2)
317 313 mail
318 314 minitest-reporters
319 315 momentjs-rails
320 316 mysql2
321 317 puma
322 318 rails (~> 5.2)
323 319 rails-controller-testing
324 320 rails_bootstrap_sortable
325 321 rdiscount
326 322 rouge
@@ -1,40 +1,40
1 1 - content_for :head do
2 2 <meta http-equiv ="refresh" content="60"/>
3 3
4 4 %h1 Grader information
5 5
6 6 %p
7 7 = link_to 'Refresh', { :action => 'list' }, class: 'btn btn-info'
8 8
9 9 .panel.panel-primary
10 10 .panel-heading
11 11 Grader control:
12 12 .panel-body
13 - =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default', method: 'post'
14 - =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default', method: 'post'
15 - =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default', method: 'post'
16 - =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default', method: 'post'
13 + =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default'
14 + =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default'
15 + =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default'
16 + =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default'
17 17
18 18 .row
19 19 .col-md-6
20 20 - if @last_task
21 21 Last task:
22 22 = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
23 23
24 24 %br/
25 25
26 26 - if @last_test_request
27 27 Last test_request:
28 28 = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
29 29
30 30 %h2 Current graders
31 31
32 32 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
33 33
34 34 %h2 Stalled graders
35 35
36 36 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
37 37
38 38 %h2 Terminated graders
39 39
40 40 %p= link_to 'Clear data for terminated graders', { action: 'clear_terminated'}, class: 'btn btn-default', method: 'post'
You need to be logged in to leave comments. Login now