Merge branch 'jr-46209-web-ide-copy' into 'master'

Fix outdated web ide copy See merge request gitlab-org/gitlab-ce!18861

Merge branch 'jr-46209-web-ide-copy' into 'master'
6657e65d · Tim Zallmann · Mayra Cabrera · a14ebd41 · 6657e65d · 6657e65d
Commit 6657e65d authored May 10, 2018 by Tim Zallmann Committed by Mayra Cabrera May 10, 2018
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

ide.vue app/assets/javascripts/ide/components/ide.vue +2 -2

jr-46209-web-ide-copy.yml changelogs/unreleased/jr-46209-web-ide-copy.yml +5 -0

No files found.
--- 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>

--- a/changelogs/unreleased/jr-46209-web-ide-copy.yml
+++ b/changelogs/unreleased/jr-46209-web-ide-copy.yml
+---
+title: Fix outdated Web IDE welcome copy
+merge_request: 18861
+author:
+type: fixed