Using puma instead of thin

Updated gems Custom twitter-bootstrap-rails with BS 2.3.2 and FA 3.2.0
2013-06-13 13:00:48 +02:00
parent e7c6cb9133
commit 89072dd53e
4 changed files with 21 additions and 31 deletions
@@ -4,7 +4,7 @@ ruby '2.0.0'
 gem 'rails', '4.0.0.rc2'

 # Servers
-gem 'thin'
+gem 'puma'
 gem 'unicorn'

 # Multi-environment configuration
@@ -39,10 +39,10 @@ gem 'handlebars_assets'
 gem 'i18n-js'
 gem 'jquery-turbolinks'
 gem 'less-rails'
-gem 'sass-rails', '~> 4.0.0.rc1'
+gem 'sass-rails', '~> 4.0.0.rc2'
 gem 'therubyracer'
 gem 'turbolinks'
-gem 'twitter-bootstrap-rails'
+gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.0'
 gem 'uglifier', '>= 1.3.0'

 group :development, :test do