diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2017-09-28 09:44:04 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2017-09-28 09:44:04 -0400 |
| commit | a20d60fa1b7b4b2c1fbc1721e2e7a5e1ee9d7c3e (patch) | |
| tree | 187b27157852ef3a6f500f4fb944f80c813dbd32 /app/controllers/projects/blob_controller.rb | |
| parent | a4ffde6efe7d0218fc79e7d5b1307caa675dd358 (diff) | |
| download | gitlab-ce-reject-push.tar.gz | |
Adds dummy URL.reject-push
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 2b8f3977e6e..43c73f0d55b 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -201,7 +201,10 @@ class Projects::BlobController < Projects::ApplicationController path_segments = @path.split('/') path_segments.pop tree_path = path_segments.join('/') - + last_commit = @repository.last_commit_for_path(@commit.id, @blob.path) + puts '---------*_*__*_*_*_*_*_*_*_*_*_*_*_*_*_*' + puts params[:only] + puts '---------*_*__*_*_*_*_*_*_*_*_*_*_*_*_*_*' render json: json.merge( path: blob.path, name: blob.name, @@ -209,6 +212,8 @@ class Projects::BlobController < Projects::ApplicationController size: blob.raw_size, mime_type: blob.mime_type, binary: blob.raw_binary?, + last_commit: last_commit, + dummy_url: project_blob_path(@project, File.join('{{branch}}', blob.path)), simple_viewer: blob.simple_viewer&.class&.partial_name, rich_viewer: blob.rich_viewer&.class&.partial_name, show_viewer_switcher: !!blob.show_viewer_switcher?, |