aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock15
1 files changed, 10 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7206994bf..bf60b28f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/afimb/ninoxe.git
- revision: bfe0ccb3519e6b0e4e99657c1f108d07754ff7c7
+ revision: 9cff11ccd859b0d7288a20bef04fa9941512985c
branch: rails4
specs:
ninoxe (1.1.3)
@@ -13,6 +13,12 @@ GIT
foreigner (= 1.6.0)
georuby-ext (= 0.0.5)
+GIT
+ remote: https://github.com/mislav/will_paginate.git
+ revision: 74a6cd0197072903cd8b83744133744ff4b4c046
+ specs:
+ will_paginate (3.0.4)
+
GEM
remote: http://rubygems.org/
remote: https://rails-assets.org/
@@ -51,7 +57,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
- acts-as-taggable-on (3.4.2)
+ acts-as-taggable-on (3.4.3)
activerecord (>= 3.2, < 5)
acts_as_list (0.6.0)
activerecord (>= 3.0)
@@ -413,7 +419,6 @@ GEM
rubyzip (>= 0.9, < 1.2)
warden (1.2.3)
rack (>= 1.0)
- will_paginate (3.0.5)
will_paginate-bootstrap (1.0.0)
will_paginate (>= 3.0.3)
xpath (2.0.0)
@@ -487,7 +492,7 @@ DEPENDENCIES
rubyzip (~> 1.1.6)
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
- simple_form
+ simple_form (~> 3.1.0)
spring
sqlite3
squeel
@@ -497,5 +502,5 @@ DEPENDENCIES
turbolinks
uglifier (>= 1.3.0)
warbler
- will_paginate (~> 3.0)
+ will_paginate (~> 3.0)!
will_paginate-bootstrap