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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ With <a href="https://github.com/folke/lazy.nvim">Lazy</a>:
dependencies = {
"MunifTanjim/nui.nvim",
"nvim-lua/plenary.nvim",
"dlyongemallo/diffview.nvim", -- Maintained fork of "sindrets/diffview.nvim".
"dlyongemallo/diffview-plus.nvim", -- Maintained fork of "sindrets/diffview.nvim".
"stevearc/dressing.nvim", -- Recommended but not required. Better UI for pickers.
"nvim-tree/nvim-web-devicons", -- Recommended but not required. Icons in discussion tree.
},
Expand All @@ -60,7 +60,7 @@ And with <a href="https://github.com/lewis6991/pckr.nvim">pckr.nvim</a>:
requires = {
"MunifTanjim/nui.nvim",
"nvim-lua/plenary.nvim",
"dlyongemallo/diffview.nvim", -- Maintained fork of "sindrets/diffview.nvim".
"dlyongemallo/diffview-plus.nvim", -- Maintained fork of "sindrets/diffview.nvim".
"stevearc/dressing.nvim", -- Recommended but not required. Better UI for pickers.
"nvim-tree/nvim-web-devicons", -- Recommended but not required. Icons in discussion tree.
},
Expand All @@ -74,7 +74,7 @@ And with <a href="https://github.com/lewis6991/pckr.nvim">pckr.nvim</a>:

Add `branch = "develop",` to your configuration if you want to use the (possibly unstable) development version of `gitlab.nvim`.

`gitlab.nvim` uses the `diffview.nvim` plugin for showing the diffs in a MR. We recommend using [dlyongemallo's](https://github.com/dlyongemallo/diffview.nvim) fork which is the de-facto maintained version of the plugin with many fixes and improvements (e.g., marking files as viewed).
`gitlab.nvim` uses the `diffview.nvim` plugin for showing the diffs in a MR. We recommend using `dlyongemallo`'s [diffview+](https://github.com/dlyongemallo/diffview-plus.nvim) fork which is the de-facto maintained version of the plugin with many fixes and improvements (e.g., marking files as viewed). The original [sindrets/diffview.nvim](https://github.com/sindrets/diffview.nvim) plugin will be supported as long as the maintenance remains feasible.

## Contributing

Expand Down
10 changes: 5 additions & 5 deletions doc/gitlab.nvim.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ With Lazy:
dependencies = {
"MunifTanjim/nui.nvim",
"nvim-lua/plenary.nvim",
"dlyongemallo/diffview.nvim", -- Maintained fork of "sindrets/diffview.nvim".
"dlyongemallo/diffview-plus.nvim", -- Maintained fork of "sindrets/diffview.nvim".
"stevearc/dressing.nvim", -- Recommended but not required. Better UI for pickers.
"nvim-tree/nvim-web-devicons", -- Recommended but not required. Icons in discussion tree.
},
Expand All @@ -81,7 +81,7 @@ And with pckr.nvim:
requires = {
"MunifTanjim/nui.nvim",
"nvim-lua/plenary.nvim",
"dlyongemallo/diffview.nvim", -- Maintained fork of "sindrets/diffview.nvim".
"dlyongemallo/diffview-plus.nvim", -- Maintained fork of "sindrets/diffview.nvim".
"stevearc/dressing.nvim", -- Recommended but not required. Better UI for pickers.
"nvim-tree/nvim-web-devicons", -- Recommended but not required. Icons in discussion tree.
},
Expand Down Expand Up @@ -864,9 +864,9 @@ plugin is loaded. If run twice, will open a second reviewer pane.
*gitlab.nvim.reload_review*
gitlab.reload_review() ~

Loads new MR state from Gitlab. Then if diffview.api is available (with the
https://github.com/dlyongemallo/diffview.nvim fork) applies the new diff refs
to the existing diffview, otherwise (with
Loads new MR state from Gitlab. Then if `diffview.api` is available (with the
https://github.com/dlyongemallo/diffview-plus.nvim fork) applies the new diff
refs to the existing diffview, otherwise (with
https://github.com/sindrets/diffview.nvim) closes and re-opens the reviewer.

>lua
Expand Down
2 changes: 1 addition & 1 deletion lua-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PLUGINS_FOLDER="tests/plugins"
PLUGINS=(
"https://github.com/MunifTanjim/nui.nvim"
"https://github.com/nvim-lua/plenary.nvim"
"https://github.com/dlyongemallo/diffview.nvim"
"https://github.com/dlyongemallo/diffview-plus.nvim"
)

if ! command -v luarocks >/dev/null 2>&1; then
Expand Down
6 changes: 5 additions & 1 deletion lua/gitlab/health.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ M.check = function(return_results)
package = "plenary",
},
{
name = "dlyongemallo/diffview.nvim",
name = "dlyongemallo/diffview-plus.nvim",
package = "diffview",
},
}
Expand All @@ -45,6 +45,10 @@ M.check = function(return_results)
name = "nvim-tree/nvim-web-devicons",
package = "nvim-web-devicons",
},
{
name = "dlyongemallo/diffview-plus.nvim",
package = "diffview.api",
},
}

local go_version_problem = version.check_go_version()
Expand Down
Loading