Merge remote-tracking branch 'origin/inbox'

2014-12-21 23:04:43 +01:00 · 2014-12-21 23:04:43 +01:00 · b01e1791d4
parent 2aea87d305 23af34494e
commit b01e1791d4
1 changed files with 2 additions and 0 deletions
--- a/app/views/inbox/show.html.haml
+++ b/app/views/inbox/show.html.haml
@ -6,6 +6,8 @@
          %h3.panel-title Out of questions?
        .panel-body
          %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question
+          %br
+          %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything?url=#{show_user_profile_path(@user.screen_name)}"} Share on Twitter
      .panel.panel-default.warning--panel
        .panel-heading
          %h3.panel-title Actions