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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem 'protected_attributes', '~> 1.1'
gem 'mysql2', '~> 0.3.11'
gem 'thin', '~> 1.5.0'

gem 'devise', '~> 3.5'
gem 'devise', '~> 4.7'
gem 'nested_form', '~> 0.3.1'
gem 'cancan', '~> 1.6.9'

Expand Down
55 changes: 29 additions & 26 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
bcrypt (3.1.10)
bcrypt (3.1.13)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
builder (3.2.3)
byebug (8.2.2)
cancan (1.6.9)
coffee-rails (4.1.1)
Expand All @@ -51,14 +51,14 @@ GEM
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.1)
crass (1.0.5)
daemons (1.1.9)
debug_inspector (0.0.2)
devise (3.5.6)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
railties (>= 4.1.0)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
domain_name (0.5.20160128)
unf (>= 0.0.5, < 1.0.0)
Expand All @@ -69,28 +69,30 @@ GEM
activesupport (>= 4.1.0)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
loofah (2.0.3)
json (1.8.6)
loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.99.1)
mini_portile2 (2.0.0)
minitest (5.8.4)
mini_portile2 (2.4.0)
minitest (5.12.2)
multi_json (1.11.2)
mysql2 (0.3.20)
nested_form (0.3.1)
netrc (0.11.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.9.1)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
protected_attributes (1.1.3)
activemodel (>= 4.0.1, < 5.0)
rack (1.6.4)
rack (1.6.11)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5.2)
Expand All @@ -106,12 +108,12 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
Expand All @@ -122,9 +124,10 @@ GEM
activesupport (= 4.2.5.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
responders (2.1.1)
railties (>= 4.2.0, < 5.1)
rake (13.0.0)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
Expand All @@ -148,23 +151,23 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.5)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.2)
twitter-bootstrap-rails (2.2.8)
actionpack (>= 3.1)
execjs
rails (>= 3.1)
railties (>= 3.1)
tzinfo (1.2.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
warden (1.2.6)
warden (1.2.7)
rack (>= 1.0)
web-console (2.3.0)
activemodel (>= 4.0)
Expand All @@ -179,7 +182,7 @@ DEPENDENCIES
byebug
cancan (~> 1.6.9)
coffee-rails (~> 4.1)
devise (~> 3.5)
devise (~> 4.7)
jquery-rails (~> 3.1)
mysql2 (~> 0.3.11)
nested_form (~> 0.3.1)
Expand Down