diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 18:06:03 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 18:06:03 +0000 |
commit | 40d3d574132d2849646c20eb9d8742b159d9bfc8 (patch) | |
tree | 431dee6675639da4421dbb1d6f50b7734a3190c3 /doc/user | |
parent | 5939b09fd3db37ec98dfce0345162617d9d1d313 (diff) | |
download | gitlab-ce-40d3d574132d2849646c20eb9d8742b159d9bfc8.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/project/integrations/img/hangouts_chat_configuration.png | bin | 44655 -> 71131 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/mattermost_configuration.png | bin | 20459 -> 114026 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/microsoft_teams_configuration.png | bin | 96509 -> 71585 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/slack_configuration.png | bin | 19812 -> 103375 bytes | |||
-rw-r--r-- | doc/user/project/web_ide/img/commit_changes.png | bin | 244172 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/web_ide/img/commit_changes_v12_3.png | bin | 0 -> 712873 bytes | |||
-rw-r--r-- | doc/user/project/web_ide/img/review_changes_v12_3.png | bin | 0 -> 660299 bytes | |||
-rw-r--r-- | doc/user/project/web_ide/index.md | 10 |
8 files changed, 7 insertions, 3 deletions
diff --git a/doc/user/project/integrations/img/hangouts_chat_configuration.png b/doc/user/project/integrations/img/hangouts_chat_configuration.png Binary files differindex 54aaef6632d..c40c9b92edb 100644 --- a/doc/user/project/integrations/img/hangouts_chat_configuration.png +++ b/doc/user/project/integrations/img/hangouts_chat_configuration.png diff --git a/doc/user/project/integrations/img/mattermost_configuration.png b/doc/user/project/integrations/img/mattermost_configuration.png Binary files differindex 6abf5c5c8d6..d196b1fc8e4 100644 --- a/doc/user/project/integrations/img/mattermost_configuration.png +++ b/doc/user/project/integrations/img/mattermost_configuration.png diff --git a/doc/user/project/integrations/img/microsoft_teams_configuration.png b/doc/user/project/integrations/img/microsoft_teams_configuration.png Binary files differindex 627715d5c18..8794991f2ec 100644 --- a/doc/user/project/integrations/img/microsoft_teams_configuration.png +++ b/doc/user/project/integrations/img/microsoft_teams_configuration.png diff --git a/doc/user/project/integrations/img/slack_configuration.png b/doc/user/project/integrations/img/slack_configuration.png Binary files differindex 10d2cda6dc7..6922c70f253 100644 --- a/doc/user/project/integrations/img/slack_configuration.png +++ b/doc/user/project/integrations/img/slack_configuration.png diff --git a/doc/user/project/web_ide/img/commit_changes.png b/doc/user/project/web_ide/img/commit_changes.png Binary files differdeleted file mode 100644 index a5364c12760..00000000000 --- a/doc/user/project/web_ide/img/commit_changes.png +++ /dev/null diff --git a/doc/user/project/web_ide/img/commit_changes_v12_3.png b/doc/user/project/web_ide/img/commit_changes_v12_3.png Binary files differnew file mode 100644 index 00000000000..0ee7da26d1a --- /dev/null +++ b/doc/user/project/web_ide/img/commit_changes_v12_3.png diff --git a/doc/user/project/web_ide/img/review_changes_v12_3.png b/doc/user/project/web_ide/img/review_changes_v12_3.png Binary files differnew file mode 100644 index 00000000000..cbc96e3dcd9 --- /dev/null +++ b/doc/user/project/web_ide/img/review_changes_v12_3.png diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index ecd8f74194e..bebb17e6381 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -49,10 +49,14 @@ After making your changes, click the **Commit** button in the bottom left to review the list of changed files. Click on each file to review the changes and click the tick icon to stage the file. -Once you have staged some changes, you can add a commit message and commit the -staged changes. Unstaged changes will not be committed. +![Review changes](img/review_changes_v12_3.png) -![Commit changes](img/commit_changes.png) +Once you have staged some changes, you can add a commit message, commit the +staged changes and directly create a merge request. In case you don't have write +access to the selected branch, you will see a warning, but still be able to create +a new branch and start a merge request. + +![Commit changes](img/commit_changes_v12_3.png) ## Reviewing changes |