Release (#440)
* Feat: Enable sorting discussions by original comment (#422) * Feat: Improve popup UX (#426) * Feat: Automatically update MR summary details (#427) * Feat: Show update progress in winbar (#432) * Feat: Abbreviate winbar (#439) * Fix: Note Creation Bug (#441) * Fix: Checking whether comment can be created (#434) * Fix: Syntax in discussion tree (#433) * fix: improve indication of resolved threads and drafts (#442) * Docs: Various minor improvements (#445) --------- Co-authored-by: Jakub F. Bortlík <jakub.bortlik@proton.me>
This commit is contained in:
committed by
GitHub
parent
be027331e1
commit
495e64c8bc
@@ -1,14 +1,14 @@
|
||||
local u = require("gitlab.utils")
|
||||
local popup = require("gitlab.popup")
|
||||
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 = {}
|
||||
|
||||
local function create_squash_message_popup()
|
||||
return Popup(u.create_popup_state("Squash Commit Message", state.settings.popup.squash_message))
|
||||
return Popup(popup.create_popup_state("Squash Commit Message", state.settings.popup.squash_message))
|
||||
end
|
||||
|
||||
---@class MergeOpts
|
||||
@@ -31,10 +31,11 @@ M.merge = function(opts)
|
||||
|
||||
if merge_body.squash then
|
||||
local squash_message_popup = create_squash_message_popup()
|
||||
popup.set_up_autocommands(squash_message_popup, nil, vim.api.nvim_get_current_win())
|
||||
squash_message_popup:mount()
|
||||
state.set_popup_keymaps(squash_message_popup, function(text)
|
||||
popup.set_popup_keymaps(squash_message_popup, function(text)
|
||||
M.confirm_merge(merge_body, text)
|
||||
end, nil, miscellaneous.editable_popup_opts)
|
||||
end, nil, popup.editable_popup_opts)
|
||||
else
|
||||
M.confirm_merge(merge_body)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user