origin pull master

2017-06-03 13:44:10 +06:30
parent 7529d23147
commit 138850fb24
119 changed files with 2531 additions and 462 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,21 @@
+GIT
+  remote: git://github.com/amatsuda/kaminari.git
+  revision: c3c853a944cd2bff072ae05e48c563b2c9a29597
+  branch: master
+  specs:
+    kaminari (1.0.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
+
 GEM
  remote: https://rubygems.org/
  specs:
@@ -231,6 +249,7 @@ DEPENDENCIES
  font-awesome-rails
  jbuilder (~> 2.5)
  jquery-rails
+  kaminari!
  listen (~> 3.0.5)
  mysql2 (>= 0.3.18, < 0.5)
  prawn
@@ -255,4 +274,4 @@ DEPENDENCIES
  web-console (>= 3.3.0)

 BUNDLED WITH
-   1.14.6
+   1.15.0