Skip to content

Commit 58bd7fe

Browse files
authored
Merge branch 'main' into add_gitvine_guiclients
2 parents 2170174 + cc93e71 commit 58bd7fe

File tree

6 files changed

+127
-115
lines changed

6 files changed

+127
-115
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ Rails/HelperInstanceVariable:
2121

2222
Rails/TimeZone:
2323
Enabled: false
24+
25+
GitHub/InsecureHashAlgorithm:
26+
Enabled: false

ARCHITECTURE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ know there's a new Git release out, then:
6161

6262
will get it on the site without waiting for the nightly run.
6363

64-
Merges to the `master` branch on GitHub auto-deploy to Heroku, so unless
64+
Merges to the `main` branch on GitHub auto-deploy to Heroku, so unless
6565
you're doing something tricky you generally shouldn't need to manually
6666
deploy.
6767

@@ -143,7 +143,7 @@ to the former.
143143

144144
The site mostly just runs without intervention:
145145

146-
- code merged to `master` is auto-deployed
146+
- code merged to `main` is auto-deployed
147147

148148
- new git versions are detected daily and manpages and download links
149149
updated

Gemfile.lock

Lines changed: 117 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.0)
5-
actionpack (= 6.1.0)
6-
activesupport (= 6.1.0)
4+
actioncable (6.1.3.1)
5+
actionpack (= 6.1.3.1)
6+
activesupport (= 6.1.3.1)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.0)
10-
actionpack (= 6.1.0)
11-
activejob (= 6.1.0)
12-
activerecord (= 6.1.0)
13-
activestorage (= 6.1.0)
14-
activesupport (= 6.1.0)
9+
actionmailbox (6.1.3.1)
10+
actionpack (= 6.1.3.1)
11+
activejob (= 6.1.3.1)
12+
activerecord (= 6.1.3.1)
13+
activestorage (= 6.1.3.1)
14+
activesupport (= 6.1.3.1)
1515
mail (>= 2.7.1)
16-
actionmailer (6.1.0)
17-
actionpack (= 6.1.0)
18-
actionview (= 6.1.0)
19-
activejob (= 6.1.0)
20-
activesupport (= 6.1.0)
16+
actionmailer (6.1.3.1)
17+
actionpack (= 6.1.3.1)
18+
actionview (= 6.1.3.1)
19+
activejob (= 6.1.3.1)
20+
activesupport (= 6.1.3.1)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.0)
24-
actionview (= 6.1.0)
25-
activesupport (= 6.1.0)
23+
actionpack (6.1.3.1)
24+
actionview (= 6.1.3.1)
25+
activesupport (= 6.1.3.1)
2626
rack (~> 2.0, >= 2.0.9)
2727
rack-test (>= 0.6.3)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (6.1.0)
31-
actionpack (= 6.1.0)
32-
activerecord (= 6.1.0)
33-
activestorage (= 6.1.0)
34-
activesupport (= 6.1.0)
30+
actiontext (6.1.3.1)
31+
actionpack (= 6.1.3.1)
32+
activerecord (= 6.1.3.1)
33+
activestorage (= 6.1.3.1)
34+
activesupport (= 6.1.3.1)
3535
nokogiri (>= 1.8.5)
36-
actionview (6.1.0)
37-
activesupport (= 6.1.0)
36+
actionview (6.1.3.1)
37+
activesupport (= 6.1.3.1)
3838
builder (~> 3.1)
3939
erubi (~> 1.4)
4040
rails-dom-testing (~> 2.0)
4141
rails-html-sanitizer (~> 1.1, >= 1.2.0)
42-
activejob (6.1.0)
43-
activesupport (= 6.1.0)
42+
activejob (6.1.3.1)
43+
activesupport (= 6.1.3.1)
4444
globalid (>= 0.3.6)
45-
activemodel (6.1.0)
46-
activesupport (= 6.1.0)
47-
activerecord (6.1.0)
48-
activemodel (= 6.1.0)
49-
activesupport (= 6.1.0)
50-
activestorage (6.1.0)
51-
actionpack (= 6.1.0)
52-
activejob (= 6.1.0)
53-
activerecord (= 6.1.0)
54-
activesupport (= 6.1.0)
55-
marcel (~> 0.3.1)
56-
mimemagic (~> 0.3.2)
57-
activesupport (6.1.0)
45+
activemodel (6.1.3.1)
46+
activesupport (= 6.1.3.1)
47+
activerecord (6.1.3.1)
48+
activemodel (= 6.1.3.1)
49+
activesupport (= 6.1.3.1)
50+
activestorage (6.1.3.1)
51+
actionpack (= 6.1.3.1)
52+
activejob (= 6.1.3.1)
53+
activerecord (= 6.1.3.1)
54+
activesupport (= 6.1.3.1)
55+
marcel (~> 1.0.0)
56+
mini_mime (~> 1.0.2)
57+
activesupport (6.1.3.1)
5858
concurrent-ruby (~> 1.0, >= 1.0.2)
5959
i18n (>= 1.6, < 2)
6060
minitest (>= 5.1)
@@ -63,22 +63,28 @@ GEM
6363
addressable (2.7.0)
6464
public_suffix (>= 2.0.2, < 5.0)
6565
asciidoctor (2.0.12)
66-
ast (2.4.1)
67-
awesome_print (1.8.0)
66+
ast (2.4.2)
67+
awesome_print (1.9.2)
6868
better_errors (2.9.1)
6969
coderay (>= 1.0.0)
7070
erubi (>= 1.0.0)
7171
rack (>= 0.9.0)
72-
binding_of_caller (0.8.0)
72+
binding_of_caller (1.0.0)
7373
debug_inspector (>= 0.0.1)
7474
builder (3.2.4)
7575
byebug (11.1.3)
7676
coderay (1.1.3)
77-
concurrent-ruby (1.1.7)
78-
crack (0.4.4)
77+
concurrent-ruby (1.1.8)
78+
crack (0.4.5)
79+
rexml
7980
crass (1.0.6)
80-
database_cleaner (1.8.5)
81-
debug_inspector (0.0.3)
81+
database_cleaner (2.0.1)
82+
database_cleaner-active_record (~> 2.0.0)
83+
database_cleaner-active_record (2.0.0)
84+
activerecord (>= 5.a)
85+
database_cleaner-core (~> 2.0.0)
86+
database_cleaner-core (2.0.1)
87+
debug_inspector (1.1.0)
8288
diff-lcs (1.4.4)
8389
diffy (3.4.0)
8490
dotenv (2.7.6)
@@ -95,55 +101,54 @@ GEM
95101
multi_json
96102
erubi (1.10.0)
97103
execjs (2.7.0)
98-
fabrication (2.21.1)
104+
fabrication (2.22.0)
99105
factory_bot (6.1.0)
100106
activesupport (>= 5.0.0)
101107
factory_bot_rails (6.1.0)
102108
factory_bot (~> 6.1.0)
103109
railties (>= 5.0.0)
104-
faraday (1.1.0)
110+
faraday (1.3.0)
111+
faraday-net_http (~> 1.0)
105112
multipart-post (>= 1.2, < 3)
106113
ruby2_keywords
114+
faraday-net_http (1.0.1)
107115
faraday_middleware (1.0.0)
108116
faraday (~> 1.0)
109-
ffi (1.13.1)
117+
ffi (1.15.0)
110118
foreman (0.87.2)
111119
globalid (0.4.2)
112120
activesupport (>= 4.2.0)
113121
hashdiff (1.0.1)
114-
i18n (1.8.5)
122+
i18n (1.8.9)
115123
concurrent-ruby (~> 1.0)
116124
iso8601 (0.13.0)
117-
jaro_winkler (1.5.4)
118125
launchy (2.5.0)
119126
addressable (~> 2.7)
120-
listen (3.3.3)
127+
listen (3.5.0)
121128
rb-fsevent (~> 0.10, >= 0.10.3)
122129
rb-inotify (~> 0.9, >= 0.9.10)
123-
loofah (2.8.0)
130+
loofah (2.9.0)
124131
crass (~> 1.0.2)
125132
nokogiri (>= 1.5.9)
126133
mail (2.7.1)
127134
mini_mime (>= 0.1.1)
128-
marcel (0.3.3)
129-
mimemagic (~> 0.3.2)
135+
marcel (1.0.0)
130136
method_source (1.0.0)
131-
mimemagic (0.3.5)
132-
mini_mime (1.0.2)
137+
mini_mime (1.0.3)
133138
mini_portile2 (2.5.0)
134-
minitest (5.14.2)
139+
minitest (5.14.4)
135140
multi_json (1.15.0)
136141
multipart-post (2.1.1)
137142
netrc (0.11.0)
138-
nio4r (2.5.4)
139-
nokogiri (1.11.0)
143+
nio4r (2.5.7)
144+
nokogiri (1.11.2)
140145
mini_portile2 (~> 2.5.0)
141146
racc (~> 1.4)
142-
octokit (4.19.0)
147+
octokit (4.20.0)
143148
faraday (>= 0.9)
144149
sawyer (~> 0.8.0, >= 0.5.3)
145150
parallel (1.20.1)
146-
parser (2.7.2.0)
151+
parser (3.0.0.0)
147152
ast (~> 2.4.1)
148153
pg (1.2.3)
149154
pry (0.13.1)
@@ -153,27 +158,27 @@ GEM
153158
byebug (~> 11.0)
154159
pry (~> 0.13.0)
155160
public_suffix (4.0.6)
156-
puma (5.1.1)
161+
puma (5.2.2)
157162
nio4r (~> 2.0)
158163
racc (1.5.2)
159164
rack (2.2.3)
160165
rack-test (1.1.0)
161166
rack (>= 1.0, < 3)
162167
rack-timeout (0.6.0)
163-
rails (6.1.0)
164-
actioncable (= 6.1.0)
165-
actionmailbox (= 6.1.0)
166-
actionmailer (= 6.1.0)
167-
actionpack (= 6.1.0)
168-
actiontext (= 6.1.0)
169-
actionview (= 6.1.0)
170-
activejob (= 6.1.0)
171-
activemodel (= 6.1.0)
172-
activerecord (= 6.1.0)
173-
activestorage (= 6.1.0)
174-
activesupport (= 6.1.0)
168+
rails (6.1.3.1)
169+
actioncable (= 6.1.3.1)
170+
actionmailbox (= 6.1.3.1)
171+
actionmailer (= 6.1.3.1)
172+
actionpack (= 6.1.3.1)
173+
actiontext (= 6.1.3.1)
174+
actionview (= 6.1.3.1)
175+
activejob (= 6.1.3.1)
176+
activemodel (= 6.1.3.1)
177+
activerecord (= 6.1.3.1)
178+
activestorage (= 6.1.3.1)
179+
activesupport (= 6.1.3.1)
175180
bundler (>= 1.15.0)
176-
railties (= 6.1.0)
181+
railties (= 6.1.3.1)
177182
sprockets-rails (>= 2.0.0)
178183
rails-controller-testing (1.0.5)
179184
actionpack (>= 5.0.1.rc1)
@@ -189,14 +194,14 @@ GEM
189194
rails_stdout_logging
190195
rails_serve_static_assets (0.0.5)
191196
rails_stdout_logging (0.0.5)
192-
railties (6.1.0)
193-
actionpack (= 6.1.0)
194-
activesupport (= 6.1.0)
197+
railties (6.1.3.1)
198+
actionpack (= 6.1.3.1)
199+
activesupport (= 6.1.3.1)
195200
method_source
196201
rake (>= 0.8.7)
197202
thor (~> 1.0)
198203
rainbow (3.0.0)
199-
rake (13.0.1)
204+
rake (13.0.3)
200205
rb-fsevent (0.10.4)
201206
rb-inotify (0.10.1)
202207
ffi (~> 1.0)
@@ -218,45 +223,49 @@ GEM
218223
redis-store (>= 1.2, < 2)
219224
redis-store (1.9.0)
220225
redis (>= 4, < 5)
226+
regexp_parser (2.1.1)
221227
rexml (3.2.4)
222-
rspec-core (3.10.0)
228+
rspec-core (3.10.1)
223229
rspec-support (~> 3.10.0)
224-
rspec-expectations (3.10.0)
230+
rspec-expectations (3.10.1)
225231
diff-lcs (>= 1.2.0, < 2.0)
226232
rspec-support (~> 3.10.0)
227-
rspec-mocks (3.10.0)
233+
rspec-mocks (3.10.2)
228234
diff-lcs (>= 1.2.0, < 2.0)
229235
rspec-support (~> 3.10.0)
230-
rspec-rails (4.0.1)
231-
actionpack (>= 4.2)
232-
activesupport (>= 4.2)
233-
railties (>= 4.2)
234-
rspec-core (~> 3.9)
235-
rspec-expectations (~> 3.9)
236-
rspec-mocks (~> 3.9)
237-
rspec-support (~> 3.9)
238-
rspec-support (3.10.0)
239-
rubocop (0.82.0)
240-
jaro_winkler (~> 1.5.1)
236+
rspec-rails (5.0.1)
237+
actionpack (>= 5.2)
238+
activesupport (>= 5.2)
239+
railties (>= 5.2)
240+
rspec-core (~> 3.10)
241+
rspec-expectations (~> 3.10)
242+
rspec-mocks (~> 3.10)
243+
rspec-support (~> 3.10)
244+
rspec-support (3.10.2)
245+
rubocop (1.6.1)
241246
parallel (~> 1.10)
242-
parser (>= 2.7.0.1)
247+
parser (>= 2.7.1.5)
243248
rainbow (>= 2.2.2, < 4.0)
249+
regexp_parser (>= 1.8, < 3.0)
244250
rexml
251+
rubocop-ast (>= 1.2.0, < 2.0)
245252
ruby-progressbar (~> 1.7)
246253
unicode-display_width (>= 1.4.0, < 2.0)
247-
rubocop-github (0.16.0)
248-
rubocop (<= 0.82.0)
249-
rubocop-performance (~> 1.0)
250-
rubocop-rails (~> 2.0)
254+
rubocop-ast (1.4.1)
255+
parser (>= 2.7.1.5)
256+
rubocop-github (0.16.1)
257+
rubocop (<= 1.6.1)
258+
rubocop-performance (<= 1.7.1)
259+
rubocop-rails (<= 2.7.1)
251260
rubocop-performance (1.7.1)
252261
rubocop (>= 0.82.0)
253-
rubocop-rails (2.6.0)
262+
rubocop-rails (2.7.1)
254263
activesupport (>= 4.2.0)
255264
rack (>= 1.1)
256-
rubocop (>= 0.82.0)
257-
ruby-prof (1.4.2)
258-
ruby-progressbar (1.10.1)
259-
ruby2_keywords (0.0.2)
265+
rubocop (>= 0.87.0)
266+
ruby-prof (1.4.3)
267+
ruby-progressbar (1.11.0)
268+
ruby2_keywords (0.0.4)
260269
sass-rails (6.0.0)
261270
sassc-rails (~> 2.1, >= 2.1.1)
262271
sassc (2.4.0)
@@ -274,7 +283,7 @@ GEM
274283
shoulda-context (~> 2.0)
275284
shoulda-matchers (~> 4.0)
276285
shoulda-context (2.0.0)
277-
shoulda-matchers (4.4.1)
286+
shoulda-matchers (4.5.1)
278287
activesupport (>= 4.2.0)
279288
sprockets (4.0.2)
280289
concurrent-ruby (~> 1.0)
@@ -284,15 +293,15 @@ GEM
284293
activesupport (>= 4.0)
285294
sprockets (>= 3.0.0)
286295
sqlite3 (1.4.2)
287-
thor (1.0.1)
296+
thor (1.1.0)
288297
tilt (2.0.10)
289-
tzinfo (2.0.3)
298+
tzinfo (2.0.4)
290299
concurrent-ruby (~> 1.0)
291300
uglifier (4.2.0)
292301
execjs (>= 0.3.0, < 3)
293302
unicode-display_width (1.7.0)
294303
vcr (6.0.0)
295-
webmock (3.10.0)
304+
webmock (3.12.2)
296305
addressable (>= 2.3.6)
297306
crack (>= 0.3.2)
298307
hashdiff (>= 0.4.0, < 2.0.0)

0 commit comments

Comments
 (0)