Gemfile.lock in cardboard_cms-0.2.2 vs Gemfile.lock in cardboard_cms-0.3.1
- old
+ new
@@ -1,22 +1,22 @@
PATH
remote: .
specs:
- cardboard_cms (0.2.2)
+ cardboard_cms (0.3.1)
bootstrap-datepicker-rails
bootstrap-sass (~> 2.2)
- bootstrap-wysihtml5-rails
+ bootstrap-wysihtml5-rails (~> 0.3.1.24)
chronic
cocoon (>= 1.2.0)
coffee-rails
decorators
dragonfly (~> 1.0)
font-awesome-sass-rails (>= 3.0.0.1)
gon
inherited_resources (>= 1.4.1)
jquery-rails
- jquery-ui-rails
+ jquery-ui-rails (~> 5.0.0)
kaminari
kaminari-bootstrap (~> 0.1.3)
rack-cache
rails (~> 4.0.0)
ranked-model (>= 0.2.1)
@@ -63,51 +63,49 @@
better_errors (0.9.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootstrap-datepicker-rails (1.3.0.1)
+ bootstrap-datepicker-rails (1.3.0.2)
railties (>= 3.0)
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
- bootstrap-wysihtml5-rails (0.3.1.23)
+ bootstrap-wysihtml5-rails (0.3.1.24)
railties (>= 3.0)
builder (3.1.4)
+ byebug (2.7.0)
+ columnize (~> 0.3)
+ debugger-linecache (~> 1.2)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
chronic (0.10.2)
- cocoon (1.2.5)
+ cocoon (1.2.6)
coderay (1.0.9)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
- coffee-script (2.2.0)
+ coffee-script (2.3.0)
coffee-script-source
execjs
- coffee-script-source (1.7.0)
- columnize (0.3.6)
+ coffee-script-source (1.7.1)
+ columnize (0.8.9)
daemons (1.1.9)
database_cleaner (1.0.1)
debug_inspector (0.0.2)
- debugger (1.6.1)
- columnize (>= 0.3.1)
- debugger-linecache (~> 1.2.0)
- debugger-ruby_core_source (~> 1.2.3)
debugger-linecache (1.2.0)
- debugger-ruby_core_source (1.2.3)
decorators (1.0.3)
railties (>= 3.0.19, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.10, != 3.2.1, != 3.2.0, != 3.1.9, != 3.1.8, != 3.1.7, != 3.1.6, != 3.1.5, != 3.1.4, != 3.1.3, != 3.1.2, != 3.1.1, != 3.1.0)
devise (3.0.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
warden (~> 1.2.3)
- dragonfly (1.0.3)
+ dragonfly (1.0.5)
multi_json (~> 1.0)
rack
erubis (2.7.0)
eventmachine (1.0.3)
execjs (1.4.0)
@@ -122,13 +120,15 @@
ffi (1.9.0)
font-awesome-sass-rails (3.0.2.2)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
formatador (0.2.4)
- gon (5.0.1)
+ gon (5.1.1)
actionpack (>= 2.3.0)
json
+ multi_json
+ request_store (>= 1.0.5)
guard (1.8.2)
formatador (>= 0.2.4)
listen (>= 1.0.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
@@ -139,20 +139,20 @@
has_scope (0.6.0.rc)
actionpack (>= 3.2, < 5)
activesupport (>= 3.2, < 5)
hike (1.2.3)
i18n (0.6.4)
- inherited_resources (1.4.1)
+ inherited_resources (1.5.0)
has_scope (~> 0.6.0.rc)
- responders (~> 1.0.0.rc)
+ responders (~> 1.0)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- jquery-ui-rails (4.1.1)
- railties (>= 3.1.0)
+ jquery-ui-rails (5.0.0)
+ railties (>= 3.2.16)
json (1.8.0)
- kaminari (0.15.1)
+ kaminari (0.16.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kaminari-bootstrap (0.1.3)
kaminari (>= 0.13.0)
rails
@@ -188,20 +188,20 @@
minitest-rails (~> 0.9.1)
multi_json (1.8.2)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
orm_adapter (0.4.0)
- polyamorous (0.6.4)
+ polyamorous (1.0.0)
activerecord (>= 3.0)
polyglot (0.3.3)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
- pry-debugger (0.2.2)
- debugger (~> 1.3)
- pry (~> 0.9.10)
+ pry-byebug (1.3.2)
+ byebug (~> 2.7)
+ pry (~> 0.9.12)
pry-rails (0.3.2)
pry (>= 0.9.10)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
rack (1.5.2)
@@ -221,43 +221,47 @@
actionpack (= 4.0.0)
activesupport (= 4.0.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
- ranked-model (0.3)
+ ranked-model (0.4.0)
activerecord (>= 3.1.12)
- ransack (1.1.0)
+ ransack (1.2.3)
actionpack (>= 3.0)
activerecord (>= 3.0)
- polyamorous (~> 0.6.0)
+ activesupport (>= 3.0)
+ i18n
+ polyamorous (~> 1.0.0)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
- responders (1.0.0)
+ request_store (1.0.7)
+ responders (1.1.0)
railties (>= 3.2, < 5)
- sass (3.2.14)
- sass-rails (4.0.1)
+ sass (3.2.19)
+ sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
- sass (>= 3.1.10)
- sprockets-rails (~> 2.0.0)
+ sass (~> 3.2.0)
+ sprockets (~> 2.8, <= 2.11.0)
+ sprockets-rails (~> 2.0)
sdoc (0.3.20)
json (>= 1.1.3)
rdoc (~> 3.10)
- select2-rails (3.5.2)
+ select2-rails (3.5.9)
thor (~> 0.14)
- simple_form (3.0.1)
- actionpack (>= 4.0.0, < 4.1)
- activemodel (>= 4.0.0, < 4.1)
+ simple_form (3.0.2)
+ actionpack (~> 4.0)
+ activemodel (~> 4.0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
- slim (2.0.2)
+ slim (2.0.3)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.4.6)
sprockets (2.10.0)
hike (~> 1.2)
@@ -267,12 +271,12 @@
sprockets-rails (2.0.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.7)
- stringex (2.2.0)
- temple (0.6.7)
+ stringex (2.5.2)
+ temple (0.6.8)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
@@ -280,11 +284,11 @@
atomic
tilt (1.4.1)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
- turbolinks (2.2.1)
+ turbolinks (2.2.2)
coffee-rails
turn (0.9.6)
ansi
tzinfo (0.3.37)
uglifier (2.1.2)
@@ -309,12 +313,13 @@
guard-minitest
jquery-rails
letter_opener
minitest-rails
minitest-rails-capybara
- pry-debugger
+ pry-byebug
pry-rails
quiet_assets
+ rake
rb-fsevent
sdoc
simplecov
sqlite3
thin