Skip to content

Commit 7a61c3e

Browse files
MitcheljagerMitcheljager
committed
Merge branch 'master' into feat/enhance
2 parents 78f5061 + 335901f commit 7a61c3e

File tree

14 files changed

+302
-81
lines changed

14 files changed

+302
-81
lines changed

‎.github/workflows/clear-cache.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Clear cache
2+
3+
on:
4+
workflow_dispatch:
5+
6+
permissions:
7+
actions: write
8+
9+
jobs:
10+
clear-cache:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Clear cache
14+
uses: actions/github-script@v6
15+
with:
16+
script: |
17+
console.log("About to clear")
18+
const caches = await github.rest.actions.getActionsCacheList({
19+
owner: context.repo.owner,
20+
repo: context.repo.repo,
21+
})
22+
for (const cache of caches.data.actions_caches) {
23+
console.log(cache)
24+
github.rest.actions.deleteActionsCacheById({
25+
owner: context.repo.owner,
26+
repo: context.repo.repo,
27+
cache_id: cache.id,
28+
})
29+
}
30+
console.log("Clear completed")

‎Gemfile.lock

Lines changed: 68 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@ GIT
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (6.1.7.7)
14-
actionpack (= 6.1.7.7)
15-
activesupport (= 6.1.7.7)
13+
actioncable (6.1.7.8)
14+
actionpack (= 6.1.7.8)
15+
activesupport (= 6.1.7.8)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
18-
actionmailbox (6.1.7.7)
19-
actionpack (= 6.1.7.7)
20-
activejob (= 6.1.7.7)
21-
activerecord (= 6.1.7.7)
22-
activestorage (= 6.1.7.7)
23-
activesupport (= 6.1.7.7)
18+
actionmailbox (6.1.7.8)
19+
actionpack (= 6.1.7.8)
20+
activejob (= 6.1.7.8)
21+
activerecord (= 6.1.7.8)
22+
activestorage (= 6.1.7.8)
23+
activesupport (= 6.1.7.8)
2424
mail (>= 2.7.1)
25-
actionmailer (6.1.7.7)
26-
actionpack (= 6.1.7.7)
27-
actionview (= 6.1.7.7)
28-
activejob (= 6.1.7.7)
29-
activesupport (= 6.1.7.7)
25+
actionmailer (6.1.7.8)
26+
actionpack (= 6.1.7.8)
27+
actionview (= 6.1.7.8)
28+
activejob (= 6.1.7.8)
29+
activesupport (= 6.1.7.8)
3030
mail (~> 2.5, >= 2.5.4)
3131
rails-dom-testing (~> 2.0)
32-
actionpack (6.1.7.7)
33-
actionview (= 6.1.7.7)
34-
activesupport (= 6.1.7.7)
32+
actionpack (6.1.7.8)
33+
actionview (= 6.1.7.8)
34+
activesupport (= 6.1.7.8)
3535
rack (~> 2.0, >= 2.0.9)
3636
rack-test (>= 0.6.3)
3737
rails-dom-testing (~> 2.0)
3838
rails-html-sanitizer (~> 1.0, >= 1.2.0)
39-
actiontext (6.1.7.7)
40-
actionpack (= 6.1.7.7)
41-
activerecord (= 6.1.7.7)
42-
activestorage (= 6.1.7.7)
43-
activesupport (= 6.1.7.7)
39+
actiontext (6.1.7.8)
40+
actionpack (= 6.1.7.8)
41+
activerecord (= 6.1.7.8)
42+
activestorage (= 6.1.7.8)
43+
activesupport (= 6.1.7.8)
4444
nokogiri (>= 1.8.5)
45-
actionview (6.1.7.7)
46-
activesupport (= 6.1.7.7)
45+
actionview (6.1.7.8)
46+
activesupport (= 6.1.7.8)
4747
builder (~> 3.1)
4848
erubi (~> 1.4)
4949
rails-dom-testing (~> 2.0)
@@ -60,22 +60,22 @@ GEM
6060
activemodel (>= 5.2.0)
6161
activestorage (>= 5.2.0)
6262
activesupport (>= 5.2.0)
63-
activejob (6.1.7.7)
64-
activesupport (= 6.1.7.7)
63+
activejob (6.1.7.8)
64+
activesupport (= 6.1.7.8)
6565
globalid (>= 0.3.6)
66-
activemodel (6.1.7.7)
67-
activesupport (= 6.1.7.7)
68-
activerecord (6.1.7.7)
69-
activemodel (= 6.1.7.7)
70-
activesupport (= 6.1.7.7)
71-
activestorage (6.1.7.7)
72-
actionpack (= 6.1.7.7)
73-
activejob (= 6.1.7.7)
74-
activerecord (= 6.1.7.7)
75-
activesupport (= 6.1.7.7)
66+
activemodel (6.1.7.8)
67+
activesupport (= 6.1.7.8)
68+
activerecord (6.1.7.8)
69+
activemodel (= 6.1.7.8)
70+
activesupport (= 6.1.7.8)
71+
activestorage (6.1.7.8)
72+
actionpack (= 6.1.7.8)
73+
activejob (= 6.1.7.8)
74+
activerecord (= 6.1.7.8)
75+
activesupport (= 6.1.7.8)
7676
marcel (~> 1.0)
7777
mini_mime (>= 1.1.0)
78-
activesupport (6.1.7.7)
78+
activesupport (6.1.7.8)
7979
concurrent-ruby (~> 1.0, >= 1.0.2)
8080
i18n (>= 1.6, < 2)
8181
minitest (>= 5.1)
@@ -119,7 +119,7 @@ GEM
119119
railties (>= 5.0)
120120
bugsnag (6.24.2)
121121
concurrent-ruby (~> 1.0)
122-
builder (3.2.4)
122+
builder (3.3.0)
123123
bullet (7.0.2)
124124
activesupport (>= 3.0.0)
125125
uniform_notifier (~> 1.11)
@@ -138,7 +138,7 @@ GEM
138138
chart-js-rails (0.1.7)
139139
railties (> 3.1)
140140
coderay (1.1.3)
141-
concurrent-ruby (1.2.3)
141+
concurrent-ruby (1.3.3)
142142
crass (1.0.6)
143143
cucumber (7.1.0)
144144
builder (~> 3.2, >= 3.2.4)
@@ -220,7 +220,7 @@ GEM
220220
faraday (~> 1)
221221
multi_json
222222
errbase (0.2.2)
223-
erubi (1.12.0)
223+
erubi (1.13.0)
224224
execjs (2.8.1)
225225
factory_bot (6.2.1)
226226
activesupport (>= 5.0.0)
@@ -267,7 +267,7 @@ GEM
267267
hashie (5.0.0)
268268
heapy (0.2.0)
269269
thor
270-
i18n (1.14.1)
270+
i18n (1.14.5)
271271
concurrent-ruby (~> 1.0)
272272
image_processing (1.12.2)
273273
mini_magick (>= 4.9.5, < 5)
@@ -315,8 +315,8 @@ GEM
315315
mini_histogram (0.3.1)
316316
mini_magick (4.11.0)
317317
mini_mime (1.1.5)
318-
mini_portile2 (2.8.5)
319-
minitest (5.22.2)
318+
mini_portile2 (2.8.7)
319+
minitest (5.23.1)
320320
msgpack (1.5.4)
321321
multi_json (1.15.0)
322322
multi_test (0.1.2)
@@ -332,12 +332,12 @@ GEM
332332
net-smtp (0.4.0.1)
333333
net-protocol
334334
nio4r (2.7.0)
335-
nokogiri (1.16.2)
335+
nokogiri (1.16.6)
336336
mini_portile2 (~> 2.8.2)
337337
racc (~> 1.4)
338-
nokogiri (1.16.2-x64-mingw32)
338+
nokogiri (1.16.6-x64-mingw32)
339339
racc (~> 1.4)
340-
nokogiri (1.16.2-x86_64-linux)
340+
nokogiri (1.16.6-x86_64-linux)
341341
racc (~> 1.4)
342342
numo-narray (0.9.2.0)
343343
oauth2 (2.0.6)
@@ -375,26 +375,26 @@ GEM
375375
public_suffix (5.0.1)
376376
puma (5.6.8)
377377
nio4r (~> 2.0)
378-
racc (1.7.3)
379-
rack (2.2.8.1)
378+
racc (1.8.0)
379+
rack (2.2.9)
380380
rack-proxy (0.7.2)
381381
rack
382382
rack-test (2.1.0)
383383
rack (>= 1.3)
384-
rails (6.1.7.7)
385-
actioncable (= 6.1.7.7)
386-
actionmailbox (= 6.1.7.7)
387-
actionmailer (= 6.1.7.7)
388-
actionpack (= 6.1.7.7)
389-
actiontext (= 6.1.7.7)
390-
actionview (= 6.1.7.7)
391-
activejob (= 6.1.7.7)
392-
activemodel (= 6.1.7.7)
393-
activerecord (= 6.1.7.7)
394-
activestorage (= 6.1.7.7)
395-
activesupport (= 6.1.7.7)
384+
rails (6.1.7.8)
385+
actioncable (= 6.1.7.8)
386+
actionmailbox (= 6.1.7.8)
387+
actionmailer (= 6.1.7.8)
388+
actionpack (= 6.1.7.8)
389+
actiontext (= 6.1.7.8)
390+
actionview (= 6.1.7.8)
391+
activejob (= 6.1.7.8)
392+
activemodel (= 6.1.7.8)
393+
activerecord (= 6.1.7.8)
394+
activestorage (= 6.1.7.8)
395+
activesupport (= 6.1.7.8)
396396
bundler (>= 1.15.0)
397-
railties (= 6.1.7.7)
397+
railties (= 6.1.7.8)
398398
sprockets-rails (>= 2.0.0)
399399
rails-dom-testing (2.2.0)
400400
activesupport (>= 5.0.0)
@@ -406,9 +406,9 @@ GEM
406406
rails_same_site_cookie (0.1.9)
407407
rack (>= 1.5)
408408
user_agent_parser (~> 2.6)
409-
railties (6.1.7.7)
410-
actionpack (= 6.1.7.7)
411-
activesupport (= 6.1.7.7)
409+
railties (6.1.7.8)
410+
actionpack (= 6.1.7.8)
411+
activesupport (= 6.1.7.8)
412412
method_source
413413
rake (>= 12.2)
414414
thor (~> 1.0)
@@ -423,7 +423,8 @@ GEM
423423
render_async (2.1.11)
424424
reverse_markdown (2.1.1)
425425
nokogiri
426-
rexml (3.2.5)
426+
rexml (3.2.8)
427+
strscan (>= 3.0.9)
427428
rspec-core (3.11.0)
428429
rspec-support (~> 3.11.0)
429430
rspec-expectations (3.11.0)
@@ -481,6 +482,7 @@ GEM
481482
activesupport (>= 5.2)
482483
sprockets (>= 3.0.0)
483484
sqlite3 (1.4.2)
485+
strscan (3.1.0)
484486
sucker_punch (3.0.1)
485487
concurrent-ruby (~> 1.0)
486488
sys-proctable (1.3.0)
@@ -529,7 +531,7 @@ GEM
529531
ffi-win32-extensions
530532
xpath (3.2.0)
531533
nokogiri (~> 1.8)
532-
zeitwerk (2.6.13)
534+
zeitwerk (2.6.16)
533535

534536
PLATFORMS
535537
ruby

‎app/assets/images/maps/large/runasapi.jpg

81.5 KB
Loading

‎app/assets/images/maps/large/webp/runasapi.webp

41.5 KB
Binary file not shown.

‎app/assets/images/maps/medium/runasapi.jpg

40.3 KB
Loading

‎app/assets/images/maps/medium/webp/runasapi.webp

10.3 KB
Binary file not shown.

‎app/assets/images/maps/small/runasapi.jpg

8.28 KB
Loading

‎app/assets/images/maps/small/webp/runasapi.webp

2.29 KB
Binary file not shown.

‎app/javascript/scss/editor/_logs.scss

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
.logs {
2+
background: lighten($bg-darker, 5%);
3+
height: calc(100% - var(--offset) - 4.5rem);
4+
margin-top: $margin * 0.25;
5+
border-radius: $border-radius;
6+
overflow: auto;
7+
8+
@include styled-scrollbar();
9+
}
10+
11+
.logs__scroller {
12+
display: flex;
13+
flex-direction: column;
14+
gap: $margin * 0.125;
15+
overflow-anchor: none;
16+
min-height: 100.001%;
17+
padding: $margin * 0.25;
18+
}
19+
20+
.logs__anchor {
21+
height: 1px;
22+
overflow-anchor: auto;
23+
}
24+
25+
.log {
26+
flex: 0 0 auto;
27+
background: $bg-darker;
28+
border-radius: $border-radius;
29+
padding: $margin * 0.125;
30+
word-break: break-all;
31+
overflow-anchor: none;
32+
33+
&:first-child {
34+
margin-top: auto;
35+
}
36+
}
37+
38+
.log__timestamp {
39+
font-size: $font-size-small;
40+
color: $text-color-dark;
41+
}
42+
43+
.log__content {
44+
color: $text-color-light;
45+
}

‎app/javascript/scss/elements/_tabs.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
color: $text-color-lightest;
7777

7878
&::after {
79-
background: $primary;
79+
background: var(--primary, #{$primary});
8080
width: 100%;
8181
transition: width 50ms, background-color 50ms;
8282
}

0 commit comments

Comments
 (0)