summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-04-16 20:51:06 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2018-04-16 20:51:06 +0000
commit4dc03de431fe5286f32c27b6aca0f0cfda1ce984 (patch)
tree2f61bb3a862f7dfc6965f816dbf91146c74698e6 /doc/user
parent46529246be8c9bceeb8c6340139ebebb7dbb91c1 (diff)
parent8d2c01f83bef14783b57fc038d00cc0e053b33d3 (diff)
downloadgitlab-ce-4dc03de431fe5286f32c27b6aca0f0cfda1ce984.tar.gz
Merge branch 'jr-web-ide-core-docs' into 'master'
Web IDE is now GA Closes #45307 See merge request gitlab-org/gitlab-ce!18403
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/index.md1
-rw-r--r--doc/user/project/web_ide/img/commit_changes.pngbin0 -> 672321 bytes
-rw-r--r--doc/user/project/web_ide/img/enable_web_ide.pngbin0 -> 11364 bytes
-rw-r--r--doc/user/project/web_ide/img/open_web_ide.pngbin0 -> 28574 bytes
-rw-r--r--doc/user/project/web_ide/index.md34
5 files changed, 35 insertions, 0 deletions
diff --git a/doc/user/project/index.md b/doc/user/project/index.md
index 5ce4ebfa811..a3d53fde399 100644
--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
@@ -45,6 +45,7 @@ and time spent on
templates for issue and merge request description fields for your project
- [Slash commands (quick actions)](quick_actions.md): Textual shortcuts for
common actions on issues or merge requests
+- [Web IDE](web_ide/index.md)
**GitLab CI/CD:**
diff --git a/doc/user/project/web_ide/img/commit_changes.png b/doc/user/project/web_ide/img/commit_changes.png
new file mode 100644
index 00000000000..b6fcbf699aa
--- /dev/null
+++ b/doc/user/project/web_ide/img/commit_changes.png
Binary files differ
diff --git a/doc/user/project/web_ide/img/enable_web_ide.png b/doc/user/project/web_ide/img/enable_web_ide.png
new file mode 100644
index 00000000000..196baa82ad2
--- /dev/null
+++ b/doc/user/project/web_ide/img/enable_web_ide.png
Binary files differ
diff --git a/doc/user/project/web_ide/img/open_web_ide.png b/doc/user/project/web_ide/img/open_web_ide.png
new file mode 100644
index 00000000000..d1192daf506
--- /dev/null
+++ b/doc/user/project/web_ide/img/open_web_ide.png
Binary files differ
diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md
new file mode 100644
index 00000000000..4b0d2c65642
--- /dev/null
+++ b/doc/user/project/web_ide/index.md
@@ -0,0 +1,34 @@
+# Web IDE
+
+> Introduced in [GitLab Ultimate][ee] 10.4.
+> Brought to [GitLab CE][ce] in 10.7.
+
+The Web IDE makes it faster and easier to contribute changes to your projects
+by providing an advanced editor with commit staging.
+
+## Open the Web IDE
+
+The Web IDE can be opened when viewing a file, from the repository file list,
+and from merge requests.
+
+![Open Web IDE](img/open_web_ide.png)
+
+## Commit changes
+
+Changed files are shown on the right in the commit panel. All changes are
+automatically staged. To commit your changes, add a commit message and click
+the 'Commit Button'.
+
+![Commit changes](img/commit_changes.png)
+
+## Comparing changes
+
+Before you commit your changes, you can compare them with the previous commit
+by switching to the review mode or selecting the file from the staged files
+list.
+
+An additional review mode is available when you open a merge request, which
+shows you a preview of the merge request diff if you commit your changes.
+
+[ee]: https://about.gitlab.com/products/
+[ce]: https://about.gitlab.com/products/