Merge branch 'master' into update · grepjava/web-frameworks@52768e2 · GitHub
Skip to content

Commit 52768e2

Browse files
authored
Merge branch 'master' into update
2 parents 506c876 + ad0beb0 commit 52768e2

6 files changed

Lines changed: 38 additions & 12 deletions

File tree

‎.spec/helpers_spec.rb‎

Lines changed: 30 additions & 0 deletions

‎.tasks/helpers.rb‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ def normalize_shell(shell)
88
end
99

1010
class Hash
11+
# Returns a new hash and leaves the receiver alone. With `merge!` the receiver
12+
# kept every key it was ever merged with, so in .tasks/db.rake, where the same
13+
# main config is merged once per framework, a framework whose config.yaml does
14+
# not set a key got the value of the framework merged before it.
1115
def recursive_merge(hash)
12-
merge!(hash) { |_, old, new| old.instance_of?(Hash) ? old.recursive_merge(new) : new }
16+
merge(hash) { |_, old, new| old.instance_of?(Hash) ? old.recursive_merge(new) : new }
1317
end
1418
end

‎javascript/fulmine/config.yaml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎v/vanilla_epoll/config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
framework:
22
github: vlang/v
3+
version: 1822cbb4b5316f433df4805bb68560fadd4df385
34

45
# Install as the `vanilla` module (import vanilla.http_server). `v install <url>`
56
# now namespaces by owner (~/.vmodules/enghitalo/vanilla), so clone to the

‎v/vanilla_io_uring/config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
framework:
22
github: vlang/v
3+
version: 1822cbb4b5316f433df4805bb68560fadd4df385
34

45
# Install as the `vanilla` module (import vanilla.http_server). `v install <url>`
56
# now namespaces by owner (~/.vmodules/enghitalo/vanilla), so clone to the

‎zig/httpz/config.yaml‎

Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)