From d92cf39dd7605bb0b8d35334edb9024b17025923 Mon Sep 17 00:00:00 2001 From: Harrison Cramer Date: Tue, 29 Aug 2023 19:30:46 -0400 Subject: [PATCH] Bugfix: Merge Function 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) --- lua/gitlab/state.lua | 6 +++--- lua/gitlab/utils/init.lua | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/lua/gitlab/state.lua b/lua/gitlab/state.lua index e749d63..f1c5498 100644 --- a/lua/gitlab/state.lua +++ b/lua/gitlab/state.lua @@ -116,9 +116,9 @@ end -- for each of the actions to occur. This is necessary because some Gitlab behaviors (like -- adding a reviewer) requires some initial state. M.dependencies = { - info = { endpoint = "/info", key = "info", state = "INFO" }, - revisions = { endpoint = "/mr/revisions", key = "Revisions", state = "MR_REVISIONS" }, - project_members = { endpoint = "/members", key = "ProjectMembers", state = "PROJECT_MEMBERS" } + info = { endpoint = "/info", key = "info", state = "INFO", refresh = false }, + revisions = { endpoint = "/mr/revisions", key = "Revisions", state = "MR_REVISIONS", refresh = false }, + project_members = { endpoint = "/members", key = "ProjectMembers", state = "PROJECT_MEMBERS", refresh = false } } diff --git a/lua/gitlab/utils/init.lua b/lua/gitlab/utils/init.lua index ac4804d..b41dcff 100644 --- a/lua/gitlab/utils/init.lua +++ b/lua/gitlab/utils/init.lua @@ -114,14 +114,6 @@ M.merge = function(defaults, overrides) 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 end