Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master'

RepoEditor: Fix reopening the existing file on refresh. Closes #38250 See merge request gitlab-org/gitlab-ce!14449

Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master'
53b3ad5f · Jacob Schatz · 2d93ff94 · 98b17bc6 · 53b3ad5f
Commit 53b3ad5f authored Sep 25, 2017 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

repo_helper.js app/assets/javascripts/repo/helpers/repo_helper.js +1 -1

No files found.
--- a/app/assets/javascripts/repo/helpers/repo_helper.js
+++ b/app/assets/javascripts/repo/helpers/repo_helper.js
@@ -178,8 +178,8 @@ const RepoHelper = {

  setFile(data, file) {
    const newFile = data;
+    newFile.url = file.url || Service.url; // Grab the URL from service, happens on page refresh.

-    newFile.url = file.url;
    if (newFile.render_error === 'too_large' || newFile.render_error === 'collapsed') {
      newFile.tooLarge = true;
    }