acoolname/gitlab.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Merge Function

Browse Source 
Previously, the merge function would override the entire default table during a
merge if a matching table was found in the override table.

This would prevent users from modifying a single setting (for instance changing
just a single icon, rather than the whole thing)
This commit is contained in:
Harrison Cramer
2023-08-29 19:30:46 -04:00
parent 72a263d346
commit d92cf39dd7
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lua/gitlab/state.lua
View File

@@ -116,9 +116,9 @@ end
-- for each of the actions to occur. This is necessary because some Gitlab behaviors (like -- for each of the actions to occur. This is necessary because some Gitlab behaviors (like
-- adding a reviewer) requires some initial state. -- adding a reviewer) requires some initial state.
M.dependencies = { M.dependencies = {
info = { endpoint = "/info", key = "info", state = "INFO" }, info = { endpoint = "/info", key = "info", state = "INFO", refresh = false },
revisions = { endpoint = "/mr/revisions", key = "Revisions", state = "MR_REVISIONS" }, revisions = { endpoint = "/mr/revisions", key = "Revisions", state = "MR_REVISIONS", refresh = false },
project_members = { endpoint = "/members", key = "ProjectMembers", state = "PROJECT_MEMBERS" } project_members = { endpoint = "/members", key = "ProjectMembers", state = "PROJECT_MEMBERS", refresh = false }
} }

8
lua/gitlab/utils/init.lua
View File

@@ -114,14 +114,6 @@ M.merge = function(defaults, overrides)
end end
end end
for key, value in pairs(overrides) do
if type(value) == "table" then
result[key] = M.merge(value, overrides[key] or {})
else
result[key] = overrides[key] or value
end
end
return result return result
end end