Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lua/gitlab/actions/merge.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ local M = {}
local function create_squash_message_popup()
return Popup(popup.create_popup_state({
title = "Squash Commit Message",
filetype = "gitcommit",
user_settings = state.settings.popup.squash_message,
}))
end
Expand Down
1 change: 1 addition & 0 deletions lua/gitlab/annotations.lua
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@

---@class PopupOpts The options for customizing popup windows
---@field title string The string to appear on top of the popup
---@field filetype? string The filetype of the popup (default: markdown)
---@field user_settings? table User-defined popup settings
---@field width? number Override default width
---@field height? number Override default height
Expand Down
3 changes: 2 additions & 1 deletion lua/gitlab/popup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ local M = {}
---@param opts PopupOpts Options for customizing the popup
---@return table
M.create_popup_state = function(opts)
opts = opts or { filetype = "markdown" }
local settings = u.merge(require("gitlab.state").settings.popup, opts.user_settings or {})
local view_opts = {
buf_options = {
filetype = "markdown",
filetype = opts.filetype,
},
relative = "editor",
enter = true,
Expand Down
Loading