Skip to content

Commit cee8e42

Browse files
Barb CutlerBarb Cutler
authored andcommitted
merge
2 parents 6b2873c + c14d7a4 commit cee8e42

File tree

94 files changed

+1614
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1614
-284
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
source 'https://rubygems.org'
33

44
group :jekyll_plugins do
5-
gem "github-pages", "231"
5+
gem "github-pages", "232"
66
end
77

88
gem 'wdm', '>= 0.1.1' if Gem.win_platform?
99

10-
gem "webrick", "~> 1.8"
10+
gem "webrick", "~> 1.9"
1111

1212
gem 'html-proofer', "~> 3.19.4"
1313

Gemfile.lock

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.1.3.2)
4+
activesupport (7.1.3.4)
55
base64
66
bigdecimal
77
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -11,19 +11,20 @@ GEM
1111
minitest (>= 5.1)
1212
mutex_m
1313
tzinfo (~> 2.0)
14-
addressable (2.8.6)
15-
public_suffix (>= 2.0.2, < 6.0)
14+
addressable (2.8.7)
15+
public_suffix (>= 2.0.2, < 7.0)
1616
base64 (0.2.0)
17-
bigdecimal (3.1.7)
17+
bigdecimal (3.1.8)
1818
coffee-script (2.4.1)
1919
coffee-script-source
2020
execjs
2121
coffee-script-source (1.12.2)
2222
colorator (1.1.0)
2323
commonmarker (0.23.10)
24-
concurrent-ruby (1.2.3)
24+
concurrent-ruby (1.3.3)
2525
connection_pool (2.4.1)
26-
dnsruby (1.71.0)
26+
csv (3.3.0)
27+
dnsruby (1.72.2)
2728
simpleidn (~> 0.2.1)
2829
drb (2.2.1)
2930
em-websocket (0.5.3)
@@ -33,19 +34,22 @@ GEM
3334
ffi (>= 1.15.0)
3435
eventmachine (1.2.7)
3536
execjs (2.9.1)
36-
faraday (2.9.0)
37+
faraday (2.10.1)
3738
faraday-net_http (>= 2.0, < 3.2)
38-
faraday-net_http (3.1.0)
39+
logger
40+
faraday-net_http (3.1.1)
3941
net-http
40-
ffi (1.16.3)
42+
ffi (1.17.0-arm64-darwin)
43+
ffi (1.17.0-x64-mingw-ucrt)
44+
ffi (1.17.0-x86_64-linux-gnu)
4145
forwardable-extended (2.6.0)
4246
gemoji (4.1.0)
43-
github-pages (231)
47+
github-pages (232)
4448
github-pages-health-check (= 1.18.2)
45-
jekyll (= 3.9.5)
49+
jekyll (= 3.10.0)
4650
jekyll-avatar (= 0.8.0)
4751
jekyll-coffeescript (= 1.2.2)
48-
jekyll-commonmark-ghpages (= 0.4.0)
52+
jekyll-commonmark-ghpages (= 0.5.1)
4953
jekyll-default-layout (= 0.1.5)
5054
jekyll-feed (= 0.17.0)
5155
jekyll-gist (= 1.5.0)
@@ -82,9 +86,10 @@ GEM
8286
liquid (= 4.0.4)
8387
mercenary (~> 0.3)
8488
minima (= 2.5.1)
85-
nokogiri (>= 1.13.6, < 2.0)
89+
nokogiri (>= 1.16.2, < 2.0)
8690
rouge (= 3.30.0)
8791
terminal-table (~> 1.4)
92+
webrick (~> 1.8)
8893
github-pages-health-check (1.18.2)
8994
addressable (~> 2.3)
9095
dnsruby (~> 1.60)
@@ -103,11 +108,12 @@ GEM
103108
typhoeus (~> 1.3)
104109
yell (~> 2.0)
105110
http_parser.rb (0.8.0)
106-
i18n (1.14.4)
111+
i18n (1.14.5)
107112
concurrent-ruby (~> 1.0)
108-
jekyll (3.9.5)
113+
jekyll (3.10.0)
109114
addressable (~> 2.4)
110115
colorator (~> 1.0)
116+
csv (~> 3.0)
111117
em-websocket (~> 0.5)
112118
i18n (>= 0.7, < 2)
113119
jekyll-sass-converter (~> 1.0)
@@ -118,16 +124,17 @@ GEM
118124
pathutil (~> 0.9)
119125
rouge (>= 1.7, < 4)
120126
safe_yaml (~> 1.0)
127+
webrick (>= 1.0)
121128
jekyll-avatar (0.8.0)
122129
jekyll (>= 3.0, < 5.0)
123130
jekyll-coffeescript (1.2.2)
124131
coffee-script (~> 2.2)
125132
coffee-script-source (~> 1.12)
126133
jekyll-commonmark (1.4.0)
127134
commonmarker (~> 0.22)
128-
jekyll-commonmark-ghpages (0.4.0)
129-
commonmarker (~> 0.23.7)
130-
jekyll (~> 3.9.0)
135+
jekyll-commonmark-ghpages (0.5.1)
136+
commonmarker (>= 0.23.7, < 1.1.0)
137+
jekyll (>= 3.9, < 4.0)
131138
jekyll-commonmark (~> 1.4.0)
132139
rouge (>= 2.0, < 5.0)
133140
jekyll-default-layout (0.1.5)
@@ -213,7 +220,7 @@ GEM
213220
gemoji (>= 3, < 5)
214221
html-pipeline (~> 2.2)
215222
jekyll (>= 3.0, < 5.0)
216-
json (2.7.2)
223+
json (2.13.0)
217224
kramdown (2.4.0)
218225
rexml
219226
kramdown-parser-gfm (1.1.0)
@@ -222,32 +229,36 @@ GEM
222229
listen (3.9.0)
223230
rb-fsevent (~> 0.10, >= 0.10.3)
224231
rb-inotify (~> 0.9, >= 0.9.10)
232+
logger (1.6.0)
225233
mercenary (0.3.6)
226234
minima (2.5.1)
227235
jekyll (>= 3.5, < 5.0)
228236
jekyll-feed (~> 0.9)
229237
jekyll-seo-tag (~> 2.1)
230-
minitest (5.22.3)
238+
minitest (5.24.1)
231239
mutex_m (0.2.0)
232240
net-http (0.4.1)
233241
uri
234-
nokogiri (1.16.3-arm64-darwin)
242+
nokogiri (1.16.7-arm64-darwin)
235243
racc (~> 1.4)
236-
nokogiri (1.16.3-x86_64-linux)
244+
nokogiri (1.16.7-x64-mingw-ucrt)
245+
racc (~> 1.4)
246+
nokogiri (1.16.7-x86_64-linux)
237247
racc (~> 1.4)
238248
octokit (4.25.1)
239249
faraday (>= 1, < 3)
240250
sawyer (~> 0.9)
241251
parallel (1.24.0)
242252
pathutil (0.16.2)
243253
forwardable-extended (~> 2.6)
244-
public_suffix (5.0.4)
245-
racc (1.7.3)
254+
public_suffix (5.1.1)
255+
racc (1.8.1)
246256
rainbow (3.1.1)
247257
rb-fsevent (0.11.2)
248-
rb-inotify (0.10.1)
258+
rb-inotify (0.11.1)
249259
ffi (~> 1.0)
250-
rexml (3.2.6)
260+
rexml (3.3.4)
261+
strscan
251262
rouge (3.30.0)
252263
rubyzip (2.3.2)
253264
safe_yaml (1.0.5)
@@ -259,32 +270,32 @@ GEM
259270
sawyer (0.9.2)
260271
addressable (>= 2.3.5)
261272
faraday (>= 0.17.3, < 3)
262-
simpleidn (0.2.1)
263-
unf (~> 0.1.4)
273+
simpleidn (0.2.3)
274+
strscan (3.1.0)
264275
terminal-table (1.8.0)
265276
unicode-display_width (~> 1.1, >= 1.1.1)
266277
typhoeus (1.4.1)
267278
ethon (>= 0.9.0)
268279
tzinfo (2.0.6)
269280
concurrent-ruby (~> 1.0)
270-
unf (0.1.4)
271-
unf_ext
272-
unf_ext (0.0.9.1)
273281
unicode-display_width (1.8.0)
274282
uri (0.13.0)
275-
webrick (1.8.1)
283+
wdm (0.2.0)
284+
webrick (1.9.1)
276285
yell (2.2.2)
277286

278287
PLATFORMS
279288
arm64-darwin-22
280289
arm64-darwin-23
290+
x64-mingw-ucrt
281291
x86_64-linux
282292

283293
DEPENDENCIES
284-
github-pages (= 231)
294+
github-pages (= 232)
285295
html-proofer (~> 3.19.4)
286296
json
287-
webrick (~> 1.8)
297+
wdm (>= 0.1.1)
298+
webrick (~> 1.9)
288299

289300
BUNDLED WITH
290301
2.5.6

_docs/developer/development_instructions/automated_grading.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,14 @@ number:
118118

119119
---
120120

121-
## Debugging
121+
## Debugging
122122

123123
To debug new features for autograding, it can be helpful to run
124124
`submitty_autograding_shipper.py` and `submitty_autograding_worker.py`
125125
interactively and inspect the output.
126126

127+
_NOTE: A cron job runs hourly to detect autograding shipper outages on the primary machine. To avoid interference during debugging, this job should be disabled before proceeding. See [Capture Cron Error Messages](/sysadmin/installation/system_customization#capture-cron-error-messages) for instructions on disabling the script._
128+
127129
To do this:
128130

129131
1. Stop the daemons (on each server, as appropriate)

_docs/developer/development_instructions/index.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,15 @@ these changes.
250250
missing the hundreds of sample student submissions present in the
251251
full installation.
252252

253+
You can append the `--test_only_grading` flag to the above command to
254+
more closely mimic the version that is on the Cypress CI.
255+
256+
If you only need a certain courses, you can append each course name to
257+
the above command to only create the courses you want.
258+
259+
_NOTE: If you mistype a course, that course will not be created. If you
260+
only have mistyped courses, then no courses gets created._
261+
253262

254263
NOTE: This command will also have to be run twice a year on July 1st and January 1st when the test semester will change from fall to spring or vice versa.
255264

_docs/developer/getting_started/commit_to_PR_from_fork.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,15 @@ The instructions below are for command line use of git.
4040
```
4141
4242
Additionally, find the name of the fork on the fork's page on Github.
43-
The `fork_name` may simply be `Submitty`, or the author may have chosen to another name.
43+
The `fork_name` may simply be `Submitty`, or the author may have chosen another name.
44+
45+
Note: make sure your git credentials are set before pulling or pushing to a forked
46+
repo. You can do this with the following commands. Use the `--global` flag if you
47+
want to set this outside of just Submitty.
48+
```
49+
git config user.name "Your Name"
50+
git config user.email "Your Email"
51+
```
4452
4553
4654
3. Next, make a local branch on your computer in your working repository

_docs/developer/getting_started/make_a_pull_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Be sure to read the [Suggestions for New Developers](/developer/getting_started/
6868
6969
* `Submission` (includes bulk uploads, teams, late days, notebook gradeables, and other student features),
7070
* `Autograding` (includes router, container/docker),
71-
* `Forum`,
71+
* `Forum` (Includes Live Chat),
7272
* `Notifications` (includes email and grade inquiries),
7373
* `TAGrading` (includes PDF annotation, peer grading),
7474
* `InstructorUI` (includes course and gradeable configuration),

0 commit comments

Comments
 (0)