Merge pull request #183 from mezis/update-gems

Update gems

Gemfile.lock

@@ -9,25 +9,25 @@ GIT
 GEM
   remote: http://yarp.dev/
   specs:
-    actionmailer (4.0.1)
-      actionpack (= 4.0.1)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
       mail (~> 2.5.4)
-    actionpack (4.0.1)
-      activesupport (= 4.0.1)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
+      activesupport (= 4.0.2)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -113,7 +113,7 @@ GEM
     database_cleaner (1.1.1)
     debug_inspector (0.0.2)
     descendants_tracker (0.0.3)
-    devise (3.2.1)
+    devise (3.2.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -152,7 +152,7 @@ GEM
     fineuploader-rails (3.3)
       actionpack (>= 3.1)
       railties (>= 3.1)
-    font-awesome-rails (3.2.1.3)
+    font-awesome-rails (4.0.3.0)
       railties (>= 3.2, < 5.0)
     formatador (0.2.4)
     fssm (0.2.10)
@@ -183,13 +183,13 @@ GEM
     guard-rspec (3.0.3)
       guard (>= 1.8)
       rspec (~> 2.13)
-    haml (4.0.3)
+    haml (4.0.4)
       tilt
-    haml-rails (0.4)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (>= 3.1, < 4.1)
-      railties (>= 3.1, < 4.1)
+    haml-rails (0.5.3)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 3.1, < 5.0)
+      railties (>= 4.0.1)
     hashie (2.0.5)
     hike (1.2.3)
     http_parser.rb (0.5.3)
@@ -231,7 +231,7 @@ GEM
       treetop (~> 1.4.8)
     memcachier (0.0.2)
     method_source (0.8.2)
-    mime-types (1.25)
+    mime-types (1.25.1)
     mini_portile (0.5.2)
     minitest (4.7.5)
     multi_json (1.8.2)
@@ -295,13 +295,13 @@ GEM
       rack (>= 0.4)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.1)
-      actionmailer (= 4.0.1)
-      actionpack (= 4.0.1)
-      activerecord (= 4.0.1)
-      activesupport (= 4.0.1)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.1)
+      railties (= 4.0.2)
       sprockets-rails (~> 2.0.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
@@ -310,17 +310,17 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.1)
     rails_stdout_logging (0.0.3)
-    railties (4.0.1)
-      actionpack (= 4.0.1)
-      activesupport (= 4.0.1)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbows (4.5.0)
       kgio (~> 2.5)
       rack (~> 1.1)
       unicorn (~> 4.6, >= 4.6.2)
     raindrops (0.12.0)
-    rake (10.1.0)
+    rake (10.1.1)
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.3)
@@ -381,7 +381,7 @@ GEM
     sinatra (1.0)
       rack (>= 1.0)
     slop (3.4.6)
-    sprockets (2.10.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -414,7 +414,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (1.3.1)
+    turbolinks (2.1.0)
       coffee-rails
     tzinfo (0.3.38)
     uglifier (2.2.1)

app/helpers/ideas_helper.rb

@@ -1,9 +1,9 @@
 # encoding: UTF-8
 module IdeasHelper
   IdeaIcons = {
-    bug:     'icon-fire',
-    chore:   'icon-bar-chart',
-    feature: 'icon-beaker',
+    bug:     'fa fa-fire',
+    chore:   'fa fa-bar-chart',
+    feature: 'fa fa-beaker',
   }
 
   def idea_kind_select_options
@@ -88,9 +88,9 @@ def idea_filter_human(filter)
 
   def idea_view_icon(view)
     case view
-    when 'cards' then 'icon-list-alt'
-    when 'board' then 'icon-columns'
-    when 'list'  then 'icon-table'
+    when 'cards' then 'fa fa-list-alt'
+    when 'board' then 'fa fa-columns'
+    when 'list'  then 'fa fa-table'
     else raise ArgumentError
     end
   end

app/helpers/users_helper.rb

@@ -26,7 +26,7 @@ def user_roles_sentence(user)
   end
 
   def user_karma_symbol
-    %{<i class='icon-leaf karma'></i>}.html_safe
+    %{<i class='fa fa-leaf karma'></i>}.html_safe
   end
 
   def user_random_greeting(user)

app/views/accounts/show.html.haml

@@ -12,10 +12,10 @@
     %p= _('They have a total of %{count} %{karma_symbol}.') % { count: current_account.users.sum(:karma), karma_symbol:user_karma_symbol }
 
     = can_link_to edit_account_path(@account), auth:[:update, @account], class:'btn btn-block' do
-      %i.icon-pencil
+      %i.fa.fa-pencil
       = _("Edit")
     = can_link_to @account, auth:[:destroy, @account], data: { confirm: 'Are you sure?' }, method: :delete, class:'btn btn-block' do
-      %i.icon-trash
+      %i.fa.fa-trash-o
       = _("Destroy")
 
     %hr/

app/views/application/_block_list.html.haml

@@ -13,7 +13,7 @@
 
 .af-block-with-title{ class:classes }
   %h4.muted
-    %i{ class: "icon-#{icon}" }
+    %i{ class: "fa fa-#{icon}" }
     = title
   %ul.af-blocklist
     - collection.each do |item|

app/views/application/_flashes.html.haml

@@ -4,4 +4,4 @@
     .container
       = message
       %button.close{ :'data-dismiss' => 'af-flash' }<
-        %i.icon-remove
+        %i.fa.fa-times

app/views/application/_header.html.haml

@@ -7,32 +7,32 @@
         %ul.nav
           = content_tag_with_path_checking(:li, controller: 'dashboards', action: 'show') do |path|
             %a{href: path, title: s_('Tooltip|Your dashboard'), :'data-placement' => 'bottom'} 
-              %i.icon-dashboard
+              %i.fa.fa-dashboard
               %span= _('Dashboard')
           - if can?(:create, Idea)
             = content_tag_with_path_checking(:li, action: 'new') do |path|
               %a{href: path, title: s_('Tooltip|Follow this link to submit a new idea'), :'data-placement' => 'bottom'} 
-                %i.icon-edit
+                %i.fa.fa-edit
                 %span= _('Submit')
           = content_tag_with_path_checking(:li, angle: 'discussable') do |path|
             %a{href: path, title: s_('Tooltip|Show stories currently being discussed'), :'data-placement' => 'bottom'}
-              %i.icon-comments-alt
+              %i.fa.fa-comments-o
               %span= _('All ideas')
           = content_tag_with_path_checking(:li, angle: 'followed') do |path|
             %a{href: path, title: s_('Tooltip|Show stories you are following'), :'data-placement' => 'bottom'}
-              %i.icon-bookmark-empty
+              %i.fa.fa-bookmark-o
               %span= _('Bookmarks')
 
         %ul.nav.pull-right#current_user
           - if current_account
             = content_tag_with_path_checking(:li, controller: 'accounts', html: { class:'dropdown' }) do
               %a.dropdown-toggle#account-dropdown{ role:'button', :'data-toggle' => 'dropdown', :'data-target' =>'#', href:'#' }
                 %span.team-name= current_account.name
-                %i.icon-group
+                %i.fa.fa-group
               %ul.dropdown-menu#account-menu
                 %li
                   = link_to current_account do
-                    %i.icon-user
+                    %i.fa.fa-user
                     = _('View team details')
                 - if login_other_accounts.any?
                   %li.divider
@@ -41,7 +41,7 @@
                   - login_other_accounts.each do |account|
                     %li
                       = link_to session_path(account_id:account), method:'put' do
-                        %i.icon-group
+                        %i.fa.fa-group
                         = account.name
                 %li.divider
                 %li
@@ -58,8 +58,8 @@
               = link_to path, class: 'notifications' do
                 - count = current_user.notifications.unread.count
                 %span.figure= number_with_delimiter(count) if count > 0
-                %i.icon-inbox
+                %i.fa.fa-inbox
           - if current_login
             %li.sign-out
               = link_to destroy_login_session_path, method: :delete, title: s_('Tooltip|Sign out'), :'data-placement' => 'left' do
-                %i.icon-eject<>
+                %i.fa.fa-eject<>

app/views/application/_needs_avatar.html.haml

@@ -3,7 +3,7 @@
     .container
       %h4
         %button.close{ :'data-dismiss' => 'af-flash' }<
-          %i.icon-remove
+          %i.fa.fa-times
         = _('How about adding an avatar to your account?')
       %p
         = _('Knowing who you are discussing ideas with is important in communication. Also, the default avatars are a bit ugly, so a picture of you would be much better.')

app/views/attachments/_attachment.html.haml

@@ -17,11 +17,11 @@
     - if is_image
        
     - else
-      %i.icon-file
+      %i.fa.fa-file
       = attachment.name.gsub(/.*\./,'').upcase
   - if show_title
     .name
       = attachment.name.gsub(/(.*)\..*/,'\1')
   - if can?(:destroy, attachment)
     = link_to attachment, method: :delete, remote:true, class:'af-corner-link af-mutable', data: { confirm: _('Are you sure?') } do
-      %i.icon-trash
+      %i.fa.fa-trash-o

app/views/attachments/_uploader.html.haml

@@ -26,7 +26,7 @@
         .qq-uploader<
           .btn.btn-block.qq-upload-button>
             .af-drop-area.qq-upload-drop-area<>
-            %i.icon-upload
+            %i.fa.fa-upload
             = _('Attach a file')
           .qq-drop-processing<>
             .qq-drop-processing-spinner<>
@@ -36,7 +36,7 @@
         .qq-uploader<
           %a.qq-upload-button>
             .af-drop-area.qq-upload-drop-area<>
-            %i.icon-upload
+            %i.fa.fa-upload
           .qq-drop-processing<>
             .qq-drop-processing-spinner<>
           .qq-upload-list<>
@@ -56,8 +56,8 @@
   - case format 
   - when 'big'
     .btn.btn-block.disabled{ title:not_authorized_message(:update, owner) }
-      %i.icon-upload
+      %i.fa.fa-upload
       = _('Attach a file')
   - when 'small'
     %a.disabled{ title:not_authorized_message(:update, owner) }
-      %i.icon-upload
+      %i.fa.fa-upload

app/views/comments/_comment_block.html.haml

@@ -26,32 +26,32 @@
     - if !can?(:vote, comment)
       %li
         %a.disabled
-          %i.icon-thumbs-up
+          %i.fa.fa-thumbs-up
       %li
         %a.disabled
-          %i.icon-thumbs-down
+          %i.fa.fa-thumbs-down
     - elsif current_user_vote && current_user_vote.up
       %li
         %a.disabled
-          %i.icon-thumbs-up
+          %i.fa.fa-thumbs-up
       %li
         = link_to comment_vote_path(comment, current_user_vote), remote:true, method: :delete, class: 'delete-vote', title:_('Cancel your upvote') do
-          %i.icon-thumbs-down
+          %i.fa.fa-thumbs-down
     - elsif current_user_vote # downvoted by user
       %li
         = link_to comment_vote_path(comment, current_user_vote), remote:true, method: :delete, class: 'delete-vote', title:_('Cancel your downvote') do
-          %i.icon-thumbs-up
+          %i.fa.fa-thumbs-up
       %li
         %a.disabled
-          %i.icon-thumbs-down
+          %i.fa.fa-thumbs-down
     - else
       %li
         = link_to comment_votes_path(comment, vote: { up:true }), remote:true, method: :post, class: 'upvote', title:_('Upvote this comment') do
-          %i.icon-thumbs-up
+          %i.fa.fa-thumbs-up
       %li
         = link_to comment_votes_path(comment, vote: { up:false }), remote:true, method: :post, class: 'downvote', title:_('Downvote this comment') do
-          %i.icon-thumbs-down
+          %i.fa.fa-thumbs-down
     %li
       = can_link_to comment_path(comment), auth:[:destroy, comment], method: :delete, remote:true, class: 'delete', title:_('Delete this comment'), data: { confirm:_('Are you sure?') } do
-        %i.icon-trash
+        %i.fa.fa-trash-o
 

app/views/dashboards/show.html.haml

@@ -1,7 +1,7 @@
 .muted
   .ht-with-margin-icon
     .ht-margin-icon
-      %i.icon-info-sign
+      %i.fa.fa-info-sign
     = _('This is your dashboard.')
 
 - if can?(:size, Idea)

app/views/errors/bad_request.html.haml

@@ -1,8 +1,8 @@
 - title _('Uh-oh...'), show_title:false
 
 %h3
-  %i.icon-cloud
+  %i.fa.fa-cloud
   = _("Sorry, we could not get that page for you.")
 
 - if defined?(message)
-  %p= message
+  %p= message

app/views/errors/forbidden.html.haml

@@ -1,8 +1,8 @@
 - title _('Hey!'), show_title:false
 
 %h3
-  %i.icon-lock
+  %i.fa.fa-lock
   = _("Sorry, but we can't let you access that page.")
 
 - if defined?(message)
-  %p= message
+  %p= message