Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
63ba4cea
Commit
63ba4cea
authored
Nov 05, 2020
by
Russell Dickenson
Committed by
Nick Gaskill
Nov 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed layout of manual patch instructions
parent
43c80e10
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
doc/user/application_security/img/vulnerability_page_download_patch_button_v13_1.png
...ty/img/vulnerability_page_download_patch_button_v13_1.png
+0
-0
doc/user/application_security/index.md
doc/user/application_security/index.md
+3
-6
No files found.
doc/user/application_security/img/vulnerability_page_download_patch_button_v13_1.png
deleted
100644 → 0
View file @
43c80e10
8.77 KB
doc/user/application_security/index.md
View file @
63ba4cea
...
@@ -252,14 +252,11 @@ Selecting the button creates a merge request with the solution.
...
@@ -252,14 +252,11 @@ Selecting the button creates a merge request with the solution.
#### Manually applying the suggested patch
#### Manually applying the suggested patch
1.
To manually apply the patch that was generated by GitLab for a vulnerability, select the dropdown arrow on the
**
Resolve
To manually apply the patch that GitLab generated for a vulnerability:
with merge request
** button, then select **
Download patch to resolve
**
:
![
Resolve with Merge Request button dropdown
](
img/vulnerability_page_merge_request_button_dropdown_v13_1.png
)
1.
Select the
**Resolve with merge request**
dropdown, then select
**Download patch to resolve**
:
1.
The button's text changes to
**Download patch to resolve**
. Click on it to download the patch:
!
[
Resolve with Merge Request button dropdown
](
img/vulnerability_page_merge_request_button_dropdown_v13_1.png
)
![
Download patch button
](
img/vulnerability_page_download_patch_button_v13_1.png
)
1.
Ensure your local project has the same commit checked out that was used to generate the patch.
1.
Ensure your local project has the same commit checked out that was used to generate the patch.
1.
Run
`git apply remediation.patch`
.
1.
Run
`git apply remediation.patch`
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment