Merge branch 'release/0.6.0'

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.6.0
+-----
+* Fontawesome 3.2.1
+
 0.5.1
 -----
 * Fixed specs

Gemfile

@@ -42,7 +42,7 @@ gem 'less-rails'
 gem 'sass-rails', '~> 4.0.0.rc2'
 gem 'therubyracer'
 gem 'turbolinks'
-gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.0'
+gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.1'
 gem 'uglifier', '>= 1.3.0'
 
 group :development, :test do

Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: git://github.com/diowa/twitter-bootstrap-rails.git
-  revision: bfc3bfecf6ff0e47a12c7ca25702edd44a4f6ed8
+  revision: 05f7e9fa7f1c7d7101d2f177169e8d632b9b9e65
-  branch: fontawesome-3.2.0
+  branch: fontawesome-3.2.1
   specs:
     twitter-bootstrap-rails (2.2.7)
       actionpack (>= 3.1)
@@ -106,7 +106,7 @@ GEM
     haml_assets (0.2.2)
       haml
       tilt
-    handlebars_assets (0.13.0)
+    handlebars_assets (0.14.0)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt
@@ -142,7 +142,7 @@ GEM
     mini_portile (0.5.0)
     minitest (4.7.4)
     mono_logger (1.1.0)
-    multi_json (1.7.6)
+    multi_json (1.7.7)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     pg (0.15.1)
@@ -153,7 +153,7 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.1)
       pry (>= 0.9.10)
-    puma (2.0.1)
+    puma (2.1.1)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-contrib (1.1.0)
@@ -176,7 +176,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.11.0)
-    rake (10.0.4)
+    rake (10.1.0)
     redis (3.0.4)
     redis-namespace (1.3.0)
       redis (~> 3.0.0)
@@ -251,7 +251,7 @@ GEM
     uglifier (2.1.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    unicorn (4.6.2)
+    unicorn (4.6.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)

VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

app/views/pages/home.html.haml

@@ -1,6 +1,6 @@
 - title t('hello')
 %h1
-  %i.icon-sun
+  %i.icon-gear
-  Here comes the sun
+  Top Gear
 %p.lead.muted
-  Ruby 2 + Rails 4.0.0.rc2 + Bootstrap 2.3.2 + Font Awesome 3.2.0
+  Ruby 2 + Rails 4.0.0.rc2 + Bootstrap 2.3.2 + Font Awesome 3.2.1