Merge branch 'dev'

reyesyang · Dec 19, 2012 · 2dcebbb · 2dcebbb
2 parents d8561bf + 2245e23
commit 2dcebbb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -8,6 +8,7 @@ def initialize(user)
       can :manage, :all
     else
       can :create, :session
+      can :about, User
       can :read, Article
       can :read, Tag
       cannot :show, Article do |article|

diff --git a/app/views/users/about.html.haml b/app/views/users/about.html.haml
@@ -0,0 +1,6 @@
+%header
+  %h2= t 'about_me'
+
+.self_introduction= sanitize t('temp_me')
+
+= render :partial => 'layouts/disque'