diff --git a/Gemfile b/Gemfile index 78fa41a0..7e5fdf1b 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem 'mimemagic' gem 'language_engine', git: 'https://github.com/entur/language_engine' gem 'calendar_helper', '0.2.6' gem 'cocoon' -gem 'formtastic', '4.0.0' +gem 'formtastic', '5.0.0' gem 'RedCloth' gem 'simple_form', '~> 5.2.0' gem 'font-awesome-sass', '~> 4.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9153606e..c489830c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -329,8 +329,8 @@ GEM font-awesome-sass (4.2.2) sass (~> 3.2) formatador (1.1.0) - formtastic (4.0.0) - actionpack (>= 5.2.0) + formtastic (5.0.0) + actionpack (>= 6.0.0) geokit (1.6.7) multi_json (>= 1.3.2) georuby (2.3.0) @@ -359,7 +359,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) inherited_resources (1.13.1) actionpack (>= 5.2, < 7.1) @@ -402,7 +402,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.21.4) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) lumberjack (1.2.10) @@ -426,7 +426,7 @@ GEM mini_portile2 (2.8.5) mini_racer (0.6.4) libv8-node (~> 16.19.0.0) - minitest (5.18.1) + minitest (5.22.2) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.3.0) @@ -543,16 +543,18 @@ GEM actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-erd (1.7.2) activerecord (>= 4.2) activesupport (>= 4.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) @@ -747,7 +749,7 @@ DEPENDENCIES ffi-proj4! figaro (~> 1.2.0) font-awesome-sass (~> 4.2.0) - formtastic (= 4.0.0) + formtastic (= 5.0.0) georuby (= 2.3.0) georuby-ext! google-analytics-rails (~> 1.1.0)