Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 65 additions & 56 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ PATH
para (0.7.2)
active_decorator (~> 1.0)
activejob-status
bootstrap-sass (~> 3.3.0)
cancancan (~> 1.9)
closure_tree (~> 6.2)
bootstrap-sass (>= 3.3, < 3.5)
cancancan (~> 3.0)
closure_tree (~> 7.0)
cocoon
coffee-rails
compass-rails
deep_cloneable (>= 2.2.1)
devise (>= 3.0, < 5.0)
font-awesome-rails (~> 4.7.0)
font-awesome-sass (~> 4.7.0)
font-awesome-sass (>= 4.7.0, <= 6.0.0)
friendly_id (~> 5.1)
haml-rails
jquery-rails
Expand Down Expand Up @@ -69,7 +69,8 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_decorator (1.1.1)
active_decorator (1.3.1)
activesupport
activejob (5.0.0.1)
activesupport (= 5.0.0.1)
globalid (>= 0.3.6)
Expand All @@ -88,42 +89,50 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.1.4)
autoprefixer-rails (9.4.2)
autoprefixer-rails (9.7.0)
execjs
bcrypt (3.1.11)
bootstrap-kaminari-views (0.0.5)
kaminari (>= 0.13)
rails (>= 3.1)
bootstrap-sass (3.3.7)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
sassc (>= 2.0.0)
builder (3.2.3)
cancancan (1.17.0)
cancancan (3.0.1)
chunky_png (1.3.11)
climate_control (0.2.0)
closure_tree (6.6.0)
activerecord (>= 4.1.0)
with_advisory_lock (>= 3.0.0)
closure_tree (7.0.0)
activerecord (>= 4.2.10)
with_advisory_lock (>= 4.0.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
cocoon (1.2.12)
cocoon (1.2.14)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
compass (0.12.2)
compass (1.0.3)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-rails (2.0.0)
compass (>= 0.12.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
compass-rails (2.0.1)
compass (~> 1.0.0)
concurrent-ruby (1.0.5)
crass (1.0.3)
deep_cloneable (2.3.2)
activerecord (>= 3.1.0, < 6)
deep_cloneable (3.0.0)
activerecord (>= 3.1.0, < 7)
devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -132,17 +141,16 @@ GEM
warden (~> 1.2.3)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.9.25)
font-awesome-rails (4.7.0.4)
railties (>= 3.2, < 6.0)
font-awesome-sass (4.7.0)
sass (>= 3.2)
friendly_id (5.2.4)
ffi (1.11.1)
font-awesome-rails (4.7.0.5)
railties (>= 3.2, < 6.1)
font-awesome-sass (5.11.2)
sassc (>= 1.11)
friendly_id (5.3.0)
activerecord (>= 4.0.0)
fssm (0.2.10)
globalid (0.3.7)
activesupport (>= 4.1.0)
haml (5.0.4)
haml (5.1.2)
temple (>= 0.8.0)
tilt
haml-rails (1.0.0)
Expand Down Expand Up @@ -177,6 +185,7 @@ GEM
mimemagic (0.3.0)
mini_portile2 (2.3.0)
minitest (5.11.1)
multi_json (1.14.1)
nio4r (1.2.1)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
Expand All @@ -187,7 +196,7 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
pg (1.1.3)
pg (1.1.4)
polyamorous (1.3.1)
activerecord (>= 3.0)
rack (2.0.3)
Expand All @@ -210,7 +219,7 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-i18n (5.1.2)
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.0.0.1)
Expand All @@ -227,39 +236,39 @@ GEM
i18n
polyamorous (~> 1.3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
request_store (1.4.1)
rack (>= 1.4)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
roo (2.7.1)
roo (2.8.2)
nokogiri (~> 1)
rubyzip (~> 1.1, < 2.0.0)
rubyzip (>= 1.2.1, < 2.0.0)
roo-xls (1.2.0)
nokogiri
roo (>= 2.0.0, < 3)
spreadsheet (> 0.9.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
ruby-ole (1.2.12.1)
ruby_parser (3.11.0)
rspec-core (3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.0)
ruby-ole (1.2.12.2)
ruby_parser (3.14.1)
sexp_processor (~> 4.9)
rubyzip (1.2.2)
sass (3.7.2)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
rubyzip (1.3.0)
sass (3.4.25)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.2.1)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
selectize-rails (0.12.3)
sexp_processor (4.11.0)
sexp_processor (4.13.0)
simple_form (3.5.0)
actionpack (> 4, < 5.2)
activemodel (> 4, < 5.2)
Expand All @@ -268,7 +277,7 @@ GEM
redactor-rails
selectize-rails
simple_form
spreadsheet (1.1.8)
spreadsheet (1.2.5)
ruby-ole (>= 1.0)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
Expand All @@ -277,10 +286,10 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.8.0)
temple (0.8.2)
thor (0.19.1)
thread_safe (0.3.6)
tilt (2.0.8)
tilt (2.0.10)
truncate_html (0.9.3)
turbolinks (5.0.1)
turbolinks-source (~> 5)
Expand All @@ -294,7 +303,7 @@ GEM
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
with_advisory_lock (4.0.0)
with_advisory_lock (4.6.0)
activerecord (>= 4.2)

PLATFORMS
Expand Down
2 changes: 1 addition & 1 deletion para.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Gem::Specification.new do |s|
s.add_dependency 'closure_tree', '~> 7.0'
s.add_dependency 'friendly_id', '~> 5.1'

s.add_dependency 'bootstrap-sass', '~> 3.3.0'
s.add_dependency 'bootstrap-sass', '>= 3.3', '< 3.5'
s.add_dependency 'font-awesome-rails', '~> 4.7.0'
s.add_dependency 'haml-rails'
s.add_dependency 'sass-rails'
Expand Down