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
d956823c
Commit
d956823c
authored
Sep 01, 2021
by
Russell Dickenson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'aqualls-gitpod-docs' into 'master'
Describe how to add to existing MRs See merge request gitlab-org/gitlab!69126
parents
997cfbd8
d2caeaae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
4 deletions
+32
-4
doc/user/project/merge_requests/index.md
doc/user/project/merge_requests/index.md
+15
-0
doc/user/project/web_ide/img/open_web_ide.png
doc/user/project/web_ide/img/open_web_ide.png
+0
-0
doc/user/project/web_ide/index.md
doc/user/project/web_ide/index.md
+17
-4
No files found.
doc/user/project/merge_requests/index.md
View file @
d956823c
...
@@ -76,6 +76,21 @@ can assign, categorize, and track progress on a merge request:
...
@@ -76,6 +76,21 @@ can assign, categorize, and track progress on a merge request:
-
[
**Notifications**
](
../../profile/notifications.md
)
: A toggle to select whether
-
[
**Notifications**
](
../../profile/notifications.md
)
: A toggle to select whether
or not to receive notifications for updates to a merge request.
or not to receive notifications for updates to a merge request.
## Add changes to a merge request
If you have permission to add changes to a merge request, you can add your changes
to an existing merge request in several ways, depending on the complexity of your change and whether you need access to a development environment:
-
[
Edit changes in the Web IDE
](
../web_ide/index.md
)
in your browser. Use this
browser-based method to edit multiple files, or if you are not comfortable with Git commands.
You cannot run tests from the Web IDE.
-
[
Edit changes in Gitpod
](
../../../integration/gitpod.md#launch-gitpod-in-gitlab
)
, if you
need a fully-featured environment to both edit files, and run tests afterward. Gitpod
supports running the
[
GitLab Development Kit (GDK)
](
https://gitlab.com/gitlab-org/gitlab-development-kit
)
.
To use Gitpod, you must
[
enable Gitpod in your user account
](
../../../integration/gitpod.md#enable-gitpod-in-your-user-settings
)
.
-
[
Push changes from the command line
](
../../../gitlab-basics/start-using-git.md
)
, if you are
familiar with Git and the command line.
## Close a merge request
## Close a merge request
If you decide to permanently stop work on a merge request,
If you decide to permanently stop work on a merge request,
...
...
doc/user/project/web_ide/img/open_web_ide.png
deleted
100644 → 0
View file @
997cfbd8
27.9 KB
doc/user/project/web_ide/index.md
View file @
d956823c
...
@@ -16,9 +16,22 @@ projects by providing an advanced editor with commit staging.
...
@@ -16,9 +16,22 @@ projects by providing an advanced editor with commit staging.
## Open the Web IDE
## Open the Web IDE
You can open the Web IDE when viewing a file, from the repository file list,
You can open the Web IDE when viewing a file, from the repository file list,
and from merge requests.
and from merge requests:
![
Open Web IDE
](
img/open_web_ide.png
)
-
*When viewing a file, or the repository file list*
-
1.
In the upper right corner of the page, select
**Edit in Web IDE**
if it is visible.
1.
If
**Edit in Web IDE**
is not visible:
1.
Select the
**(angle-down)**
next to
**Edit**
or
**Gitpod**
, depending on your configuration.
1.
Select
**Edit in Web IDE**
from the list to display it as the editing option.
1.
Select
**Edit in Web IDE**
to open the editor.
-
*When viewing a merge request*
-
1.
Go to your merge request, and select the
**Overview**
tab.
1.
Scroll to the widgets area, after the merge request description.
1.
Select
**Edit in Web IDE**
if it is visible.
1.
If
**Edit in Web IDE**
is not visible:
1.
Select the
**(angle-down)**
next to
**Open in Gitpod**
.
1.
Select
**Open in Web IDE**
from the list to display it as the editing option.
1.
Select
**Open in Web IDE**
to open the editor.
## File finder
## File finder
...
@@ -249,7 +262,7 @@ The image is uploaded to the same directory and is named `image.png` by default.
...
@@ -249,7 +262,7 @@ The image is uploaded to the same directory and is named `image.png` by default.
If another file already exists with the same name, a numeric suffix is automatically
If another file already exists with the same name, a numeric suffix is automatically
added to the filename.
added to the filename.
There are two ways to preview Markdown content in the Web IDE:
There are two ways to preview Markdown content in the Web IDE:
1.
At the top of the file's tab, select
**Preview Markdown**
to preview the formatting
1.
At the top of the file's tab, select
**Preview Markdown**
to preview the formatting
in your file. You can't edit the file in this view.
in your file. You can't edit the file in this view.
...
...
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