created subcategories

2015-01-16 07:50:36 +01:00
parent 8384bcbd30
commit e5809207a9
12 changed files with 109 additions and 29 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -87,6 +87,8 @@ GEM
    nokogiri (1.6.5)
      mini_portile (~> 0.6.0)
    pg (0.18.1)
+    puma (2.10.2)
+      rack (>= 1.1, < 2.0)
    rack (1.6.0)
    rack-test (0.6.3)
      rack (>= 1.0)
@@ -164,6 +166,7 @@ DEPENDENCIES
  jbuilder (~> 2.0)
  jquery-rails
  pg
+  puma
  rails (= 4.2.0)
  sass-rails (~> 5.0)
  sdoc (~> 0.4.0)