Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-05-10 16:34:10 +0300
committerTim Zallmann <tzallmann@gitlab.com>2018-05-10 16:34:10 +0300
commit1248189117c7e487ae73bf13f01747990a83df41 (patch)
tree3a5d8c87f04726536dabc759669cbf54bb3b49d4
parentdd72887864835e78b62dfc9807d50029b6c39536 (diff)
parent0e15b493f6286a26dc88961c16b25a9402dfecd8 (diff)
Merge branch 'jr-46209-web-ide-copy' into 'master'
Fix outdated web ide copy See merge request gitlab-org/gitlab-ce!18861
-rw-r--r--app/assets/javascripts/ide/components/ide.vue4
-rw-r--r--changelogs/unreleased/jr-46209-web-ide-copy.yml5
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue
index d479b705e35..6c373a92776 100644
--- a/app/assets/javascripts/ide/components/ide.vue
+++ b/app/assets/javascripts/ide/components/ide.vue
@@ -110,8 +110,8 @@ export default {
Welcome to the GitLab IDE
</h4>
<p>
- You can select a file in the left sidebar to begin
- editing and use the right sidebar to commit your changes.
+ Select a file from the left sidebar to begin editing.
+ Afterwards, you'll be able to commit your changes.
</p>
</div>
</div>
diff --git a/changelogs/unreleased/jr-46209-web-ide-copy.yml b/changelogs/unreleased/jr-46209-web-ide-copy.yml
new file mode 100644
index 00000000000..87ccae6ced0
--- /dev/null
+++ b/changelogs/unreleased/jr-46209-web-ide-copy.yml
@@ -0,0 +1,5 @@
+---
+title: Fix outdated Web IDE welcome copy
+merge_request: 18861
+author:
+type: fixed