diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-25 22:06:57 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-25 22:06:57 +0000 |
| commit | 53b3ad5f7ce50bfdb1dd0c72b3cc2b020f52abe1 (patch) | |
| tree | 08e24d8d91f293e14412a82c12672d46ba6589a2 /app | |
| parent | 2d93ff94bb7fc611e98bcff82c9aec8054e5721b (diff) | |
| parent | 98b17bc6deaae530134e8055e25fb303467fbaef (diff) | |
| download | gitlab-ce-53b3ad5f7ce50bfdb1dd0c72b3cc2b020f52abe1.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/repo/helpers/repo_helper.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js index 2bd8d7eea65..655e4e7605b 100644 --- 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; } |