diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-07-02 06:29:42 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-07-02 06:29:42 +0000 |
| commit | bebbb43f7133cc03c3a9944d2a4b9586a6a0d06f (patch) | |
| tree | 26b96831830504d51a94240d2bb3de916f41b0ea /app/views/layouts | |
| parent | 91820f967db8aef75d247a61f4843fb0cdf23d89 (diff) | |
| parent | 114dd976426a26c19d5e2a350a2c41bda35ddf54 (diff) | |
| download | gitlab-ce-bebbb43f7133cc03c3a9944d2a4b9586a6a0d06f.tar.gz | |
Merge branch 'osw-persist-tmp-snippet-uploads' into 'master'
Persist tmp snippet uploads at users
See merge request gitlab/gitlabhq!3138
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/snippets.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml index 5f986c81ff4..841b2a5e79c 100644 --- a/app/views/layouts/snippets.html.haml +++ b/app/views/layouts/snippets.html.haml @@ -1,9 +1,10 @@ - header_title _("Snippets"), snippets_path +- snippets_upload_path = snippets_upload_path(@snippet, current_user) - content_for :page_specific_javascripts do - - if @snippet && current_user + - if snippets_upload_path -# haml-lint:disable InlineJavaScript :javascript - window.uploads_path = "#{upload_path('personal_snippet', id: @snippet.id)}"; + window.uploads_path = "#{snippets_upload_path}"; = render template: "layouts/application" |