Temporary registers, SSH Port, Bug Fixes (#251)
- allows SSH Gitlab connection to have custom port - introduces temporary registers - fixes issue w/ quitting the popup on MR creation This is a #MINOR release
This commit is contained in:
committed by
GitHub
parent
36f512cd6d
commit
7c3ee0530b
@@ -3,6 +3,7 @@ local Popup = require("nui.popup")
|
||||
local state = require("gitlab.state")
|
||||
local job = require("gitlab.job")
|
||||
local reviewer = require("gitlab.reviewer")
|
||||
local miscellaneous = require("gitlab.actions.miscellaneous")
|
||||
|
||||
local M = {}
|
||||
|
||||
@@ -17,7 +18,7 @@ end
|
||||
|
||||
---@param opts MergeOpts
|
||||
M.merge = function(opts)
|
||||
local merge_body = { squash = state.settings.merge.squash, delete_branch = state.settings.merge.delete_branch }
|
||||
local merge_body = { squash = state.INFO.squash, delete_branch = state.INFO.delete_branch }
|
||||
if opts then
|
||||
merge_body.squash = opts.squash ~= nil and opts.squash
|
||||
merge_body.delete_branch = opts.delete_branch ~= nil and opts.delete_branch
|
||||
@@ -33,7 +34,7 @@ M.merge = function(opts)
|
||||
squash_message_popup:mount()
|
||||
state.set_popup_keymaps(squash_message_popup, function(text)
|
||||
M.confirm_merge(merge_body, text)
|
||||
end)
|
||||
end, nil, miscellaneous.editable_popup_opts)
|
||||
else
|
||||
M.confirm_merge(merge_body)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user