summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorJames Ramsay <james@jramsay.com.au>2018-04-16 11:54:21 -0400
committerJames Ramsay <james@jramsay.com.au>2018-04-16 11:54:21 -0400
commit8d2c01f83bef14783b57fc038d00cc0e053b33d3 (patch)
tree4cc4969fc2565ca58cbf2303b194b34ece258a90 /doc/user
parentc1017ebf1bdf00302da45229bdb8b88f1ba7b43d (diff)
downloadgitlab-ce-8d2c01f83bef14783b57fc038d00cc0e053b33d3.tar.gz
Remove web ide beta flag from docs and update
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/web_ide/img/commit_changes.pngbin8527 -> 672321 bytes
-rw-r--r--doc/user/project/web_ide/index.md31
2 files changed, 15 insertions, 16 deletions
diff --git a/doc/user/project/web_ide/img/commit_changes.png b/doc/user/project/web_ide/img/commit_changes.png
index e014149e8b8..b6fcbf699aa 100644
--- a/doc/user/project/web_ide/img/commit_changes.png
+++ b/doc/user/project/web_ide/img/commit_changes.png
Binary files differ
diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md
index de4d5fabe63..4b0d2c65642 100644
--- a/doc/user/project/web_ide/index.md
+++ b/doc/user/project/web_ide/index.md
@@ -1,26 +1,15 @@
# Web IDE
> Introduced in [GitLab Ultimate][ee] 10.4.
+> Brought to [GitLab CE][ce] in 10.7.
-> **Warning:** Web IDE is in **Beta**. For the latest updates, check the
-> associated [epic](https://gitlab.com/groups/gitlab-org/-/epics/26).
-
-The Web IDE editor makes it faster and easier to contribute changes to your
-projects by providing an advanced editor with commit staging.
-
-## Enable the Web IDE
-
-While in the early stages of the Beta, access to the Web IDE is by opting in.
-
-To enable the Web IDE, click on your profile image in the top right corner and
-navigate to **Settings > Preferences**, check **Enable Web IDE** and save.
-
-![Enable Web IDE](img/enable_web_ide.png)
+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
-Once enabled, the Web IDE can be opened when viewing a file, from the
-repository file list.
+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)
@@ -32,4 +21,14 @@ 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/