Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 18 insertions, 0 deletions

diff --git a/app/controllers/api/identities_controller.rb b/app/controllers/api/identities_controller.rb
new file mode 100644
index 0000000..de4910a
--- /dev/null
+++ b/app/controllers/api/identities_controller.rb
@@ -0,0 +1,18 @@
+module Api
+  class IdentitiesController < ApiController
+    before_filter :token_authenticate
+    before_filter :require_monitor
+
+    respond_to :json
+
+    def show
+      @identity = Identity.find_by_address(params[:id])
+      if @identity
+        respond_with @identity
+      else
+        render_not_found
+      end
+    end
+
+  end
+end