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
bb6fd39f
Commit
bb6fd39f
authored
Jul 18, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
9988c795
9967b2d1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
0 deletions
+51
-0
doc/user/project/issues/confidential_issues.md
doc/user/project/issues/confidential_issues.md
+46
-0
doc/user/project/issues/img/confidential_mr_branch_dropdown_v12_1.png
...ject/issues/img/confidential_mr_branch_dropdown_v12_1.png
+0
-0
doc/user/project/issues/img/confidential_mr_dropdown_v12_1.png
...ser/project/issues/img/confidential_mr_dropdown_v12_1.png
+0
-0
doc/user/project/merge_requests/index.md
doc/user/project/merge_requests/index.md
+5
-0
No files found.
doc/user/project/issues/confidential_issues.md
View file @
bb6fd39f
...
...
@@ -77,3 +77,49 @@ project's search results respectively.
| Maintainer access | Guest access |
| :-----------: | :----------: |
| !
[
Confidential issues search master
](
img/confidential_issues_search_master.png
)
| !
[
Confidential issues search guest
](
img/confidential_issues_search_guest.png
)
|
## Merge Requests for Confidential Issues
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/58583) in GitLab 12.1.
To help prevent confidential information being leaked from a public project
in the process of resolving a confidential issue, confidential issues can be
resolved by creating a merge request from a private fork.
The merge request created will target the default branch of the private fork,
not the default branch of the public upstream project. This prevents the merge
request, branch, and commits entering the public repository, and revealing
confidential information prematurely. When the confidential commits are ready
to be made public, this can be done by opening a merge request from the private
fork to the public upstream project.
TIP:
**Best practice:**
If you create a long-lived private fork in the same group or in a sub-group of
the original upstream, all the users with Developer membership to the public
project will also have the same permissions in the private project. This way,
all the Developers, who have access to view confidential issues, will have a
streamlined workflow for fixing them.
### How it works
On a confidential issue, a
**Create confidential merge request**
button is
available. Clicking on it will open a dropdown where you can choose to
**Create confidential merge request and branch**
or
**Create branch**
:
| Create confidential merge request | Create branch |
| :-------------------------------: | :-----------: |
| !
[
Create Confidential Merge Request Dropdown
](
img/confidential_mr_dropdown_v12_1.png
)
| !
[
Create Confidential Branch Dropdown
](
img/confidential_mr_branch_dropdown_v12_1.png
)
|
The
**Project**
dropdown includes the list of private forks the user is a member
of as at least a Developer and merge requests are enabled.
Whenever the
**Branch name**
and
**Source (branch or tag)**
fields change, the
availability of the target or source branch will be checked. Both branches should
be available in the private fork selected.
By clicking the
**Create confidential merge request**
button, GitLab will create
the branch and merge request in the private fork. When you choose
**Create branch**
, GitLab will only create the branch.
Once the branch is created in the private fork, developers can now push code to
that branch to fix the confidential issue.
doc/user/project/issues/img/confidential_mr_branch_dropdown_v12_1.png
0 → 100644
View file @
bb6fd39f
119 KB
doc/user/project/issues/img/confidential_mr_dropdown_v12_1.png
0 → 100644
View file @
bb6fd39f
125 KB
doc/user/project/merge_requests/index.md
View file @
bb6fd39f
...
...
@@ -365,6 +365,11 @@ have been marked as a **Work In Progress**.
[
Learn more about setting a merge request as "Work In Progress".
](
work_in_progress_merge_requests.md
)
## Merge Requests for Confidential Issues
Create
[
merge requests to resolve confidential issues
](
../issues/confidential_issues.md#merge-requests-for-confidential-issues
)
for preventing leakage or early release of sentive data through regular merge requests.
## Merge request approvals **(STARTER)**
> Included in [GitLab Starter][products].
...
...
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