summaryrefslogtreecommitdiffstats
path: root/app/controllers/blobs_controller.rb
diff options
context:
space:
mode:
authorMarius Mathiesen <marius@shortcut.no>2010-01-26 13:00:28 +0100
committerMarius Mathiesen <marius@shortcut.no>2010-01-26 13:00:28 +0100
commit408f6ddeb70d7d34cec7fd31f1aa0e0534bc387f (patch)
treea02208f98c8c2930aca8c71b251f348685d0ecd9 /app/controllers/blobs_controller.rb
parent628ed4e05cfe77e08d1e56f600a871e553f559ea (diff)
downloadgitorious-mainline-outdated-408f6ddeb70d7d34cec7fd31f1aa0e0534bc387f.zip
gitorious-mainline-outdated-408f6ddeb70d7d34cec7fd31f1aa0e0534bc387f.tar.gz
gitorious-mainline-outdated-408f6ddeb70d7d34cec7fd31f1aa0e0534bc387f.tar.bz2
Adding JSON support to Blobs#history
This was requested on IRC the other day, to check for updates to a Greasemonkey script
Diffstat (limited to 'app/controllers/blobs_controller.rb')
-rw-r--r--app/controllers/blobs_controller.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/controllers/blobs_controller.rb b/app/controllers/blobs_controller.rb
index c2240c1..25e98d5 100644
--- a/app/controllers/blobs_controller.rb
+++ b/app/controllers/blobs_controller.rb
@@ -87,7 +87,17 @@ class BlobsController < ApplicationController
:name => @blob.basename
})
@commits = @git.log(@ref, desplat_path(@path))
- expires_in 30.minutes
+ expires_in 30.minutes
+ respond_to do |wants|
+ wants.html
+ wants.json {render :json =>
+ @commits.map{|c|{
+ :author => c.author.name,
+ :sha => c.id,
+ :message => c.short_message,
+ :committed_date => c.committed_date}
+ }.to_json}
+ end
end
protected