diff --git a/Gemfile b/Gemfile index 152afddb0c..b756a99928 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Core rails -gem 'rails', '4.2.9' +gem 'rails', '4.2.11.1' gem 'sqlite3' gem 'bootsnap', require: false gem 'sprockets', '~>3.7.2' diff --git a/Gemfile.lock b/Gemfile.lock index 5ee01833f8..6774d21ab0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,21 +130,21 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) + actionmailer (4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) + actionpack (4.2.11.1) + actionview (= 4.2.11.1) + activesupport (= 4.2.11.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) + actionview (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) @@ -182,19 +182,19 @@ GEM active-fedora (>= 9.7, < 12) noid (~> 0.9) rails (>= 4.2.7.1, < 6) - activejob (4.2.9) - activesupport (= 4.2.9) + activejob (4.2.11.1) + activesupport (= 4.2.11.1) globalid (>= 0.3.0) activejob-traffic_control (0.1.3) activejob (>= 4.2) activesupport (>= 4.2) suo - activemodel (4.2.9) - activesupport (= 4.2.9) + activemodel (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) - activerecord (4.2.9) - activemodel (= 4.2.9) - activesupport (= 4.2.9) + activerecord (4.2.11.1) + activemodel (= 4.2.11.1) + activesupport (= 4.2.11.1) arel (~> 6.0) activerecord-session_store (1.1.0) actionpack (>= 4.0, < 5.2) @@ -202,7 +202,7 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 1.5.2, < 3) railties (>= 4.0, < 5.2) - activesupport (4.2.9) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -318,7 +318,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.5) config (1.4.0) activesupport (>= 3.0) deep_merge (~> 1.1.1) @@ -385,7 +385,7 @@ GEM rubydora (~> 1.8) font-awesome-rails (4.7.0.2) railties (>= 3.2, < 5.2) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) google-analytics-rails (1.1.0) google-api-client (0.13.6) @@ -497,11 +497,11 @@ GEM activesupport (>= 4, < 5.2) railties (>= 4, < 5.2) request_store (~> 1.0) - loofah (2.2.2) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.1) + mini_mime (>= 0.1.1) marc (1.0.2) scrub_rb (>= 1.0.1, < 2) unf @@ -510,12 +510,12 @@ GEM mediashelf-loggable (0.4.10) memoist (0.16.0) method_source (0.9.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mimemagic (0.3.2) - mini_mime (0.1.4) - mini_portile2 (2.3.0) + mini_mime (1.0.1) + mini_portile2 (2.4.0) minitest (5.11.3) mono_logger (1.1.0) msgpack (1.2.0) @@ -530,8 +530,8 @@ GEM net-ssh (4.2.0) netrc (0.11.0) noid (0.9.0) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nom-xml (0.6.0) activesupport (>= 3.2.18) i18n @@ -574,21 +574,21 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.0.0) - rack (1.6.10) + rack (1.6.11) rack-protection (1.5.5) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.9) - actionmailer (= 4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) - activemodel (= 4.2.9) - activerecord (= 4.2.9) - activesupport (= 4.2.9) + rails (4.2.11.1) + actionmailer (= 4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) + activemodel (= 4.2.11.1) + activerecord (= 4.2.11.1) + activesupport (= 4.2.11.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.9) + railties (= 4.2.11.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -598,14 +598,14 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + railties (4.2.11.1) + actionpack (= 4.2.11.1) + activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.3.0) + rake (12.3.2) rb-readline (0.5.5) rchardet (1.6.1) rdf (2.2.12) @@ -797,7 +797,7 @@ GEM sxp (1.0.1) rdf (>= 2.2, < 4.0) temple (0.8.0) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.8) twitter-typeahead-rails (0.11.1.pre.corejavascript) @@ -918,7 +918,7 @@ DEPENDENCIES poltergeist pry-byebug pry-rails - rails (= 4.2.9) + rails (= 4.2.11.1) rb-readline rdf (~> 2.2) rdf-rdfxml diff --git a/config/application.rb b/config/application.rb index 6717aa49d0..f3e0fc5240 100644 --- a/config/application.rb +++ b/config/application.rb @@ -8,7 +8,7 @@ Bundler.require(*Rails.groups) module Avalon - VERSION = '6.4.4' + VERSION = '6.4.5' class Application < Rails::Application require 'avalon/configuration'