Skip to content
Open
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
60 changes: 33 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ GEM
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.3.0)
bootstrap_form (2.3.0)
builder (3.2.2)
builder (3.2.3)
byebug (5.0.0)
columnize (= 0.9.0)
cancancan (1.12.0)
Expand Down Expand Up @@ -105,6 +105,8 @@ GEM
sass-rails (>= 4.0.3)
comfy_blog (1.12.3)
comfortable_mexican_sofa (>= 1.12.7)
concurrent-ruby (1.1.5)
crass (1.0.5)
database_cleaner (1.5.1)
debug_inspector (0.0.2)
delayed_job (4.0.6)
Expand All @@ -130,20 +132,22 @@ GEM
railties (>= 3.0.0)
globalid (0.3.5)
activesupport (>= 4.1.0)
haml (4.0.6)
haml (5.1.2)
temple (>= 0.8.0)
tilt
haml-rails (0.9.0)
haml-rails (1.0.0)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 4.0.6, < 5.0)
haml (>= 4.0.6, < 6.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
html2haml (2.0.0)
html2haml (2.2.0)
erubis (~> 2.7.0)
haml (~> 4.0.0)
nokogiri (~> 1.6.0)
haml (>= 4.0, < 6)
nokogiri (>= 1.6.0)
ruby_parser (~> 3.5)
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
Expand All @@ -153,20 +157,21 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
json (1.8.6)
kramdown (1.8.0)
loofah (2.0.2)
loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.6.1)
mimemagic (0.3.0)
mini_portile (0.6.2)
minitest (5.7.0)
mini_portile2 (2.4.0)
minitest (5.12.2)
multi_json (1.11.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
paperclip (4.3.0)
activemodel (>= 3.2.0)
Expand All @@ -189,7 +194,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
rack (1.6.4)
rack (1.6.11)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.1)
Expand All @@ -205,12 +210,12 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
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.2)
loofah (~> 2.0)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-i18n (4.0.4)
i18n (~> 0.6)
railties (~> 4.0)
Expand All @@ -219,7 +224,7 @@ GEM
activesupport (= 4.2.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rake (13.0.0)
rdoc (4.2.0)
responders (2.1.0)
railties (>= 4.2.0, < 5)
Expand All @@ -240,8 +245,8 @@ GEM
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
ruby_parser (3.7.0)
sexp_processor (~> 4.1)
ruby_parser (3.14.0)
sexp_processor (~> 4.9)
sass (3.4.16)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
Expand All @@ -252,7 +257,7 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
sexp_processor (4.6.0)
sexp_processor (4.13.0)
simple_form (3.2.0)
actionpack (~> 4.0)
activemodel (~> 4.0)
Expand All @@ -265,16 +270,17 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
thor (0.19.1)
thread_safe (0.3.5)
temple (0.8.2)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
tinymce-rails (4.2.3)
railties (>= 3.1.1)
tinymce-rails-langs (4.20140129)
tinymce-rails (~> 4.0)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (2.7.1)
execjs (>= 0.3.0)
Expand Down