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 @@ -37,7 +37,7 @@ gem 'activerecord-session_store'

#VIEWS
gem 'webpacker'
gem 'simple_form', '~> 3.2', '>= 3.2.1'
gem 'simple_form', '~> 5.0'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.2'
Expand Down
48 changes: 25 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ GEM
kaminari (>= 0.13)
rails (>= 3.1)
brakeman (3.7.0)
builder (3.2.3)
builder (3.2.4)
byebug (9.0.6)
carrierwave (1.1.0)
activemodel (>= 4.0.0)
Expand All @@ -613,8 +613,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.0.5-java)
concurrent-ruby (1.1.5)
connection_pool (2.2.1)
countries (2.1.4)
i18n_data (~> 0.8.0)
Expand All @@ -624,6 +623,7 @@ GEM
country_select (3.1.1)
countries (~> 2.0)
sort_alphabetical (~> 1.0)
crass (1.0.5)
devise (4.5.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -636,7 +636,7 @@ GEM
dotenv-rails (2.2.1)
dotenv (= 2.2.1)
railties (>= 3.2, < 5.2)
erubi (1.6.1)
erubi (1.9.0)
exception_notification (4.2.1)
actionmailer (>= 4.0, < 6)
activesupport (>= 4.0, < 6)
Expand All @@ -654,7 +654,8 @@ GEM
activesupport (>= 4.2.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.8.6)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
intercom-rails (0.3.8)
activesupport (> 3.0)
Expand Down Expand Up @@ -682,29 +683,30 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.0.3)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.2.0)
minitest (5.10.2)
mini_portile2 (2.4.0)
minitest (5.13.0)
money (6.10.1)
i18n (>= 0.6.4, < 1.0)
multi_json (1.12.1)
netrc (0.11.0)
nio4r (2.1.0)
nio4r (2.1.0-java)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
nokogiri (1.8.0-java)
nokogiri (1.8.0-x64-mingw32)
mini_portile2 (~> 2.2.0)
nokogiri (1.8.0-x86-mingw32)
mini_portile2 (~> 2.2.0)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.7-java)
nokogiri (1.10.7-x64-mingw32)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.7-x86-mingw32)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
pg (0.21.0)
pg (0.21.0-x64-mingw32)
Expand All @@ -714,7 +716,7 @@ GEM
public_suffix (3.0.0)
puma (3.9.1)
puma (3.9.1-java)
rack (2.0.3)
rack (2.0.8)
rack-cors (0.4.1)
rack-protection (1.5.3)
rack
Expand Down Expand Up @@ -742,8 +744,8 @@ GEM
activesupport (>= 3.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.1.2)
actionpack (= 5.1.2)
activesupport (= 5.1.2)
Expand Down Expand Up @@ -801,9 +803,9 @@ GEM
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1)
simple_form (3.5.0)
actionpack (> 4, < 5.2)
activemodel (> 4, < 5.2)
simple_form (5.0.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
sitemap_generator (6.0.1)
builder (~> 3.0)
sixarm_ruby_unaccent (1.2.0)
Expand All @@ -828,7 +830,7 @@ GEM
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.3)
tzinfo (1.2.3)
tzinfo (1.2.6)
thread_safe (~> 0.1)
tzinfo-data (1.2017.2)
tzinfo (>= 1.0.0)
Expand Down Expand Up @@ -902,7 +904,7 @@ DEPENDENCIES
rest-client
sass-rails (~> 5.0)
sidekiq
simple_form (~> 3.2, >= 3.2.1)
simple_form (~> 5.0)
sitemap_generator
spring
spring-watcher-listen (~> 2.0.0)
Expand Down