summaryrefslogtreecommitdiff
path: root/app/controllers/projects/blob_controller.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-10-19 16:24:00 +0100
committerPhil Hughes <me@iamphill.com>2017-10-23 10:46:27 +0100
commit60ce5155c8e0804b71c55d1492d7812133673fa2 (patch)
treed69150768f502be579ed8b2f0131029711da0f5e /app/controllers/projects/blob_controller.rb
parent10dcaea1c3e9061d8f65d3ec15becbd17c7b2716 (diff)
downloadgitlab-ce-60ce5155c8e0804b71c55d1492d7812133673fa2.tar.gz
fixed bug with tabs not switching correctly
clears all tmp files after cancelling edit mode
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
-rw-r--r--app/controllers/projects/blob_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 183a6f88a6a..770381472c5 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -205,6 +205,7 @@ class Projects::BlobController < Projects::ApplicationController
tree_path = path_segments.join('/')
render json: json.merge(
+ id: @blob.id,
path: blob.path,
name: blob.name,
extension: blob.extension,