cafe-grader-web

Commit r740:1be6e1b33055 public

parent | child
Description:
add rvm version & gemset file, start migrate to ruby 2.6.3
Commit status:
[Not Reviewed]
References:
algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r740:1be6e1b33055 - - 6 files changed: 155 inserted, 132 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,1
1 + grader
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,1
1 + ruby-2.6.3
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -29,7 +29,7
29 29 *.swp
30 30
31 31 #ignore rvm setting file
32 - .ruby-gemset
33 - .ruby-version
32 + #.ruby-gemset
33 + #.ruby-version
34 34
35 35 /config/secrets.yml
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -60,7 +60,8
60 60 gem 'rouge'
61 61
62 62 #bootstrap add-ons
63 - gem 'bootstrap-sass', '~> 3.2.0'
63 + gem 'bootstrap-sass', '~> 3.4.1'
64 + gem 'sassc-rails', '>= 2.1.0'
64 65 gem 'bootstrap-switch-rails'
65 66 gem 'bootstrap-toggle-rails'
66 67 gem 'autoprefixer-rails'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,94 +11,98
11 11 specs:
12 12 RubyInline (3.12.4)
13 13 ZenTest (~> 4.3)
14 - ZenTest (4.11.1)
15 - ace-rails-ap (4.1.1)
16 - actionmailer (4.2.7.1)
17 - actionpack (= 4.2.7.1)
18 - actionview (= 4.2.7.1)
19 - activejob (= 4.2.7.1)
14 + ZenTest (4.11.2)
15 + ace-rails-ap (4.2)
16 + actionmailer (4.2.11.1)
17 + actionpack (= 4.2.11.1)
18 + actionview (= 4.2.11.1)
19 + activejob (= 4.2.11.1)
20 20 mail (~> 2.5, >= 2.5.4)
21 21 rails-dom-testing (~> 1.0, >= 1.0.5)
22 - actionpack (4.2.7.1)
23 - actionview (= 4.2.7.1)
24 - activesupport (= 4.2.7.1)
22 + actionpack (4.2.11.1)
23 + actionview (= 4.2.11.1)
24 + activesupport (= 4.2.11.1)
25 25 rack (~> 1.6)
26 26 rack-test (~> 0.6.2)
27 27 rails-dom-testing (~> 1.0, >= 1.0.5)
28 28 rails-html-sanitizer (~> 1.0, >= 1.0.2)
29 - actionview (4.2.7.1)
30 - activesupport (= 4.2.7.1)
29 + actionview (4.2.11.1)
30 + activesupport (= 4.2.11.1)
31 31 builder (~> 3.1)
32 32 erubis (~> 2.7.0)
33 33 rails-dom-testing (~> 1.0, >= 1.0.5)
34 - rails-html-sanitizer (~> 1.0, >= 1.0.2)
35 - activejob (4.2.7.1)
36 - activesupport (= 4.2.7.1)
34 + rails-html-sanitizer (~> 1.0, >= 1.0.3)
35 + activejob (4.2.11.1)
36 + activesupport (= 4.2.11.1)
37 37 globalid (>= 0.3.0)
38 - activemodel (4.2.7.1)
39 - activesupport (= 4.2.7.1)
38 + activemodel (4.2.11.1)
39 + activesupport (= 4.2.11.1)
40 40 builder (~> 3.1)
41 - activerecord (4.2.7.1)
42 - activemodel (= 4.2.7.1)
43 - activesupport (= 4.2.7.1)
41 + activerecord (4.2.11.1)
42 + activemodel (= 4.2.11.1)
43 + activesupport (= 4.2.11.1)
44 44 arel (~> 6.0)
45 - activerecord-session_store (1.0.0)
46 - actionpack (>= 4.0, < 5.1)
47 - activerecord (>= 4.0, < 5.1)
45 + activerecord-session_store (1.1.3)
46 + actionpack (>= 4.0)
47 + activerecord (>= 4.0)
48 48 multi_json (~> 1.11, >= 1.11.2)
49 49 rack (>= 1.5.2, < 3)
50 - railties (>= 4.0, < 5.1)
51 - activesupport (4.2.7.1)
50 + railties (>= 4.0)
51 + activesupport (4.2.11.1)
52 52 i18n (~> 0.7)
53 - json (~> 1.7, >= 1.7.7)
54 53 minitest (~> 5.1)
55 54 thread_safe (~> 0.3, >= 0.3.4)
56 55 tzinfo (~> 1.1)
57 56 ansi (1.5.0)
58 57 arel (6.0.4)
59 - autoprefixer-rails (6.6.0)
58 + autoprefixer-rails (9.5.1.1)
60 59 execjs
61 60 best_in_place (3.0.3)
62 61 actionpack (>= 3.2)
63 62 railties (>= 3.2)
64 - bootstrap-datepicker-rails (1.7.1.1)
63 + bootstrap-datepicker-rails (1.8.0.1)
65 64 railties (>= 3.0)
66 - bootstrap-sass (3.2.0.2)
67 - sass (~> 3.2)
68 - bootstrap-switch-rails (3.3.3)
65 + bootstrap-sass (3.4.1)
66 + autoprefixer-rails (>= 5.2.1)
67 + sassc (>= 2.0.0)
68 + bootstrap-switch-rails (3.3.4)
69 69 bootstrap-toggle-rails (2.2.1.0)
70 70 bootstrap3-datetimepicker-rails (4.17.47)
71 71 momentjs-rails (>= 2.8.1)
72 - builder (3.2.2)
73 - coffee-rails (4.2.1)
72 + builder (3.2.3)
73 + coffee-rails (4.2.2)
74 74 coffee-script (>= 2.2.0)
75 - railties (>= 4.0.0, < 5.2.x)
75 + railties (>= 4.0.0)
76 76 coffee-script (2.4.1)
77 77 coffee-script-source
78 78 execjs
79 79 coffee-script-source (1.12.2)
80 - concurrent-ruby (1.0.4)
80 + concurrent-ruby (1.1.5)
81 + crass (1.0.4)
81 82 dynamic_form (1.1.4)
82 83 erubis (2.7.0)
83 84 execjs (2.7.0)
84 - fuzzy-string-match (1.0.0)
85 + ffi (1.11.1)
86 + fuzzy-string-match (1.0.1)
85 87 RubyInline (>= 3.8.6)
86 - globalid (0.3.7)
87 - activesupport (>= 4.1.0)
88 - haml (4.0.7)
88 + globalid (0.4.2)
89 + activesupport (>= 4.2.0)
90 + haml (5.1.0)
91 + temple (>= 0.8.0)
89 92 tilt
90 - haml-rails (0.9.0)
93 + haml-rails (1.0.0)
91 94 actionpack (>= 4.0.1)
92 95 activesupport (>= 4.0.1)
93 - haml (>= 4.0.6, < 5.0)
96 + haml (>= 4.0.6, < 6.0)
94 97 html2haml (>= 1.0.1)
95 98 railties (>= 4.0.1)
96 - html2haml (2.0.0)
99 + html2haml (2.2.0)
97 100 erubis (~> 2.7.0)
98 - haml (~> 4.0.0)
99 - nokogiri (~> 1.6.0)
101 + haml (>= 4.0, < 6)
102 + nokogiri (>= 1.6.0)
100 103 ruby_parser (~> 3.5)
101 - i18n (0.7.0)
104 + i18n (0.9.5)
105 + concurrent-ruby (~> 1.0)
102 106 in_place_editing (1.2.0)
103 107 jquery-countdown-rails (2.0.2)
104 108 jquery-datatables-rails (3.4.0)
@@ -106,100 +110,115
106 110 jquery-rails
107 111 railties (>= 3.1)
108 112 sass-rails
109 - jquery-rails (4.2.1)
113 + jquery-rails (4.3.3)
110 114 rails-dom-testing (>= 1, < 3)
111 115 railties (>= 4.2.0)
112 116 thor (>= 0.14, < 2.0)
113 - jquery-tablesorter (1.23.3)
117 + jquery-tablesorter (1.26.1)
114 118 railties (>= 3.2, < 6)
115 119 jquery-timepicker-addon-rails (1.4.1)
116 120 railties (>= 3.1)
117 121 jquery-ui-rails (6.0.1)
118 122 railties (>= 3.2.16)
119 - json (1.8.3)
120 - loofah (2.0.3)
123 + loofah (2.2.3)
124 + crass (~> 1.0.2)
121 125 nokogiri (>= 1.5.9)
122 - mail (2.6.4)
123 - mime-types (>= 1.16, < 4)
124 - mime-types (3.1)
125 - mime-types-data (~> 3.2015)
126 - mime-types-data (3.2016.0521)
127 - mini_portile2 (2.1.0)
128 - minitest (5.10.1)
129 - minitest-reporters (1.1.13)
126 + mail (2.7.1)
127 + mini_mime (>= 0.1.1)
128 + mini_mime (1.0.1)
129 + mini_portile2 (2.4.0)
130 + minitest (5.11.3)
131 + minitest-reporters (1.3.6)
130 132 ansi
131 133 builder
132 134 minitest (>= 5.0)
133 135 ruby-progressbar
134 - momentjs-rails (2.15.1)
136 + momentjs-rails (2.20.1)
135 137 railties (>= 3.1)
136 - multi_json (1.12.1)
137 - mysql2 (0.4.5)
138 - nokogiri (1.6.8.1)
139 - mini_portile2 (~> 2.1.0)
140 - rack (1.6.5)
138 + multi_json (1.13.1)
139 + mysql2 (0.5.2)
140 + nokogiri (1.10.3)
141 + mini_portile2 (~> 2.4.0)
142 + rack (1.6.11)
141 143 rack-test (0.6.3)
142 144 rack (>= 1.0)
143 - rails (4.2.7.1)
144 - actionmailer (= 4.2.7.1)
145 - actionpack (= 4.2.7.1)
146 - actionview (= 4.2.7.1)
147 - activejob (= 4.2.7.1)
148 - activemodel (= 4.2.7.1)
149 - activerecord (= 4.2.7.1)
150 - activesupport (= 4.2.7.1)
145 + rails (4.2.11.1)
146 + actionmailer (= 4.2.11.1)
147 + actionpack (= 4.2.11.1)
148 + actionview (= 4.2.11.1)
149 + activejob (= 4.2.11.1)
150 + activemodel (= 4.2.11.1)
151 + activerecord (= 4.2.11.1)
152 + activesupport (= 4.2.11.1)
151 153 bundler (>= 1.3.0, < 2.0)
152 - railties (= 4.2.7.1)
154 + railties (= 4.2.11.1)
153 155 sprockets-rails
154 156 rails-deprecated_sanitizer (1.0.3)
155 157 activesupport (>= 4.2.0.alpha)
156 - rails-dom-testing (1.0.8)
157 - activesupport (>= 4.2.0.beta, < 5.0)
158 + rails-dom-testing (1.0.9)
159 + activesupport (>= 4.2.0, < 5.0)
158 160 nokogiri (~> 1.6)
159 161 rails-deprecated_sanitizer (>= 1.0.1)
160 - rails-html-sanitizer (1.0.3)
161 - loofah (~> 2.0)
162 - rails_bootstrap_sortable (2.0.1)
162 + rails-html-sanitizer (1.0.4)
163 + loofah (~> 2.2, >= 2.2.2)
164 + rails_bootstrap_sortable (2.0.6)
163 165 momentjs-rails (>= 2.8.3)
164 - railties (4.2.7.1)
165 - actionpack (= 4.2.7.1)
166 - activesupport (= 4.2.7.1)
166 + railties (4.2.11.1)
167 + actionpack (= 4.2.11.1)
168 + activesupport (= 4.2.11.1)
167 169 rake (>= 0.8.7)
168 170 thor (>= 0.18.1, < 2.0)
169 - rake (12.0.0)
171 + rake (12.3.2)
172 + rb-fsevent (0.10.3)
173 + rb-inotify (0.10.0)
174 + ffi (~> 1.0)
170 175 rdiscount (2.2.0.1)
171 - rouge (2.0.7)
172 - ruby-progressbar (1.8.1)
173 - ruby_parser (3.8.3)
174 - sexp_processor (~> 4.1)
175 - sass (3.4.23)
176 - sass-rails (5.0.6)
176 + rouge (3.3.0)
177 + ruby-progressbar (1.10.0)
178 + ruby_parser (3.13.1)
179 + sexp_processor (~> 4.9)
180 + sass (3.7.4)
181 + sass-listen (~> 4.0.0)
182 + sass-listen (4.0.0)
183 + rb-fsevent (~> 0.9, >= 0.9.4)
184 + rb-inotify (~> 0.9, >= 0.9.7)
185 + sass-rails (5.0.7)
177 186 railties (>= 4.0.0, < 6)
178 187 sass (~> 3.1)
179 188 sprockets (>= 2.8, < 4.0)
180 189 sprockets-rails (>= 2.0, < 4.0)
181 190 tilt (>= 1.1, < 3)
191 + sassc (2.0.1)
192 + ffi (~> 1.9)
193 + rake
194 + sassc-rails (2.1.1)
195 + railties (>= 4.0.0)
196 + sassc (>= 2.0)
197 + sprockets (> 3.0)
198 + sprockets-rails
199 + tilt
182 200 select2-rails (4.0.3)
183 201 thor (~> 0.14)
184 - sexp_processor (4.7.0)
185 - sprockets (3.7.1)
202 + sexp_processor (4.12.0)
203 + sprockets (3.7.2)
186 204 concurrent-ruby (~> 1.0)
187 205 rack (> 1, < 3)
188 - sprockets-rails (3.2.0)
206 + sprockets-rails (3.2.1)
189 207 actionpack (>= 4.0)
190 208 activesupport (>= 4.0)
191 209 sprockets (>= 3.0.0)
192 - sqlite3 (1.3.12)
193 - thor (0.19.4)
194 - thread_safe (0.3.5)
195 - tilt (2.0.5)
196 - tzinfo (1.2.2)
210 + sqlite3 (1.4.1)
211 + temple (0.8.1)
212 + thor (0.20.3)
213 + thread_safe (0.3.6)
214 + tilt (2.0.9)
215 + tzinfo (1.2.5)
197 216 thread_safe (~> 0.1)
198 - uglifier (3.0.4)
217 + uglifier (4.1.20)
199 218 execjs (>= 0.3.0, < 3)
200 219 will_paginate (3.0.12)
201 - yaml_db (0.4.2)
202 - rails (>= 3.0, < 5.1)
220 + yaml_db (0.7.0)
221 + rails (>= 3.0)
203 222 rake (>= 0.8.7)
204 223
205 224 PLATFORMS
@@ -211,7 +230,7
211 230 autoprefixer-rails
212 231 best_in_place (~> 3.0.1)
213 232 bootstrap-datepicker-rails
214 - bootstrap-sass (~> 3.2.0)
233 + bootstrap-sass (~> 3.4.1)
215 234 bootstrap-switch-rails
216 235 bootstrap-toggle-rails
217 236 bootstrap3-datetimepicker-rails
@@ -236,6 +255,7
236 255 rdiscount
237 256 rouge
238 257 sass-rails
258 + sassc-rails (>= 2.1.0)
239 259 select2-rails
240 260 sqlite3
241 261 uglifier
@@ -244,4 +264,4
244 264 yaml_db
245 265
246 266 BUNDLED WITH
247 - 1.15.4
267 + 1.17.2
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -17,8 +17,8
17 17 t.string "author", limit: 255
18 18 t.text "body", limit: 65535
19 19 t.boolean "published"
20 - t.datetime "created_at", null: false
21 - t.datetime "updated_at", null: false
20 + t.datetime "created_at"
21 + t.datetime "updated_at"
22 22 t.boolean "frontpage", default: false
23 23 t.boolean "contest_only", default: false
24 24 t.string "title", limit: 255
@@ -28,8 +28,8
28 28 create_table "contests", force: :cascade do |t|
29 29 t.string "title", limit: 255
30 30 t.boolean "enabled"
31 - t.datetime "created_at", null: false
32 - t.datetime "updated_at", null: false
31 + t.datetime "created_at"
32 + t.datetime "updated_at"
33 33 t.string "name", limit: 255
34 34 end
35 35
@@ -45,23 +45,23
45 45
46 46 create_table "countries", force: :cascade do |t|
47 47 t.string "name", limit: 255
48 - t.datetime "created_at", null: false
49 - t.datetime "updated_at", null: false
48 + t.datetime "created_at"
49 + t.datetime "updated_at"
50 50 end
51 51
52 52 create_table "descriptions", force: :cascade do |t|
53 53 t.text "body", limit: 65535
54 54 t.boolean "markdowned"
55 - t.datetime "created_at", null: false
56 - t.datetime "updated_at", null: false
55 + t.datetime "created_at"
56 + t.datetime "updated_at"
57 57 end
58 58
59 59 create_table "grader_configurations", force: :cascade do |t|
60 60 t.string "key", limit: 255
61 61 t.string "value_type", limit: 255
62 62 t.string "value", limit: 255
63 - t.datetime "created_at", null: false
64 - t.datetime "updated_at", null: false
63 + t.datetime "created_at"
64 + t.datetime "updated_at"
65 65 t.text "description", limit: 65535
66 66 end
67 67
@@ -70,14 +70,14
70 70 t.integer "pid", limit: 4
71 71 t.string "mode", limit: 255
72 72 t.boolean "active"
73 - t.datetime "created_at", null: false
74 - t.datetime "updated_at", null: false
73 + t.datetime "created_at"
74 + t.datetime "updated_at"
75 75 t.integer "task_id", limit: 4
76 76 t.string "task_type", limit: 255
77 77 t.boolean "terminated"
78 78 end
79 79
80 - add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
80 + add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_host_and_pid", using: :btree
81 81
82 82 create_table "groups", force: :cascade do |t|
83 83 t.string "name", limit: 255
@@ -101,8 +101,8
101 101 create_table "heart_beats", force: :cascade do |t|
102 102 t.integer "user_id", limit: 4
103 103 t.string "ip_address", limit: 255
104 - t.datetime "created_at", null: false
105 - t.datetime "updated_at", null: false
104 + t.datetime "created_at"
105 + t.datetime "updated_at"
106 106 t.string "status", limit: 255
107 107 end
108 108
@@ -118,8 +118,8
118 118 create_table "logins", force: :cascade do |t|
119 119 t.integer "user_id", limit: 4
120 120 t.string "ip_address", limit: 255
121 - t.datetime "created_at", null: false
122 - t.datetime "updated_at", null: false
121 + t.datetime "created_at"
122 + t.datetime "updated_at"
123 123 end
124 124
125 125 create_table "messages", force: :cascade do |t|
@@ -128,8 +128,8
128 128 t.integer "replying_message_id", limit: 4
129 129 t.text "body", limit: 65535
130 130 t.boolean "replied"
131 - t.datetime "created_at", null: false
132 - t.datetime "updated_at", null: false
131 + t.datetime "created_at"
132 + t.datetime "updated_at"
133 133 end
134 134
135 135 create_table "problems", force: :cascade do |t|
@@ -192,8 +192,8
192 192 t.string "name", limit: 255
193 193 t.boolean "started"
194 194 t.datetime "start_time"
195 - t.datetime "created_at", null: false
196 - t.datetime "updated_at", null: false
195 + t.datetime "created_at"
196 + t.datetime "updated_at"
197 197 t.integer "country_id", limit: 4
198 198 t.string "password", limit: 255
199 199 end
@@ -201,8 +201,8
201 201 create_table "submission_view_logs", force: :cascade do |t|
202 202 t.integer "user_id", limit: 4
203 203 t.integer "submission_id", limit: 4
204 - t.datetime "created_at", null: false
205 - t.datetime "updated_at", null: false
204 + t.datetime "created_at"
205 + t.datetime "updated_at"
206 206 end
207 207
208 208 create_table "submissions", force: :cascade do |t|
@@ -249,8 +249,8
249 249 t.integer "problem_id", limit: 4
250 250 t.text "input", limit: 16777215
251 251 t.text "solution", limit: 16777215
252 - t.datetime "created_at", null: false
253 - t.datetime "updated_at", null: false
252 + t.datetime "created_at"
253 + t.datetime "updated_at"
254 254 end
255 255
256 256 create_table "test_requests", force: :cascade do |t|
@@ -261,13 +261,13
261 261 t.string "output_file_name", limit: 255
262 262 t.string "running_stat", limit: 255
263 263 t.integer "status", limit: 4
264 - t.datetime "updated_at", null: false
264 + t.datetime "updated_at"
265 265 t.datetime "submitted_at"
266 266 t.datetime "compiled_at"
267 267 t.text "compiler_message", limit: 65535
268 268 t.datetime "graded_at"
269 269 t.string "grader_comment", limit: 255
270 - t.datetime "created_at", null: false
270 + t.datetime "created_at"
271 271 t.float "running_time", limit: 24
272 272 t.string "exit_status", limit: 255
273 273 t.integer "memory_usage", limit: 4
@@ -291,8 +291,8
291 291 create_table "user_contest_stats", force: :cascade do |t|
292 292 t.integer "user_id", limit: 4
293 293 t.datetime "started_at"
294 - t.datetime "created_at", null: false
295 - t.datetime "updated_at", null: false
294 + t.datetime "created_at"
295 + t.datetime "updated_at"
296 296 t.boolean "forced_logout"
297 297 end
298 298
@@ -308,10 +308,10
308 308 t.boolean "activated", default: false
309 309 t.datetime "created_at"
310 310 t.datetime "updated_at"
311 + t.string "section", limit: 255
311 312 t.boolean "enabled", default: true
312 313 t.string "remark", limit: 255
313 314 t.string "last_ip", limit: 255
314 - t.string "section", limit: 255
315 315 end
316 316
317 317 add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
You need to be logged in to leave comments. Login now