diff --git a/CHANGELOG.md b/CHANGELOG.md
index afb15a77a..06b58715b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed
### Security
+## [v1.21.0] - 2018-08-16
+
+### Removed
+- Some locale files from upstream Spotlight removed #1228
+### Fixed
+- Long versioned pages cannot be saved now fixed #1225
+### Security
+- Updates dependencies #1232
+
## [v1.20.0] - 2018-08-09
### Added
diff --git a/Gemfile.lock b/Gemfile.lock
index 22d8aad47..0faa41204 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,7 +55,7 @@ GEM
io-like (~> 0.3.0)
arel (9.0.0)
ast (2.4.0)
- autoprefixer-rails (9.1.0)
+ autoprefixer-rails (9.1.1)
execjs
babel-source (5.8.35)
babel-transpiler (0.7.0)
@@ -85,7 +85,7 @@ GEM
bootstrap-sass (~> 3.0)
rails
ruby-oembed
- blacklight-spotlight (2.1.0)
+ blacklight-spotlight (2.2.0)
acts-as-taggable-on (>= 5.0, < 7)
almond-rails (~> 0.1)
autoprefixer-rails
@@ -102,6 +102,7 @@ GEM
faraday_middleware
friendly_id (~> 5.2)
github-markup
+ i18n (< 1.1)
i18n-active_record
iiif-presentation
iiif_manifest
@@ -225,7 +226,7 @@ GEM
deep_merge (1.2.1)
deprecation (1.0.0)
activesupport
- devise (4.4.3)
+ devise (4.5.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
@@ -285,7 +286,7 @@ GEM
factory_bot_rails (4.10.0)
factory_bot (~> 4.10.0)
railties (>= 3.0.0)
- faraday (0.15.2)
+ faraday (0.12.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
@@ -316,7 +317,6 @@ GEM
hashdiff (0.3.7)
hashie (3.5.7)
honeybadger (3.3.1)
- httpauth (0.2.1)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
@@ -342,7 +342,7 @@ GEM
jsonpath (0.9.3)
multi_json
to_regexp (~> 0.2.1)
- jwt (2.1.0)
+ jwt (1.5.6)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
@@ -384,12 +384,12 @@ GEM
material_icons (2.2.1)
railties (>= 3.2)
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_magick (4.8.0)
- mini_mime (1.0.0)
+ mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
mirador_rails (0.8.0)
@@ -408,6 +408,7 @@ GEM
stanford-mods (~> 2.1)
msgpack (1.2.4)
multi_json (1.13.1)
+ multi_xml (0.6.0)
multipart-post (2.0.0)
mysql2 (0.5.2)
namae (1.0.1)
@@ -423,10 +424,12 @@ GEM
activesupport (>= 3.2.18)
i18n
nokogiri
- oauth2 (0.6.1)
- faraday (~> 0.7)
- httpauth (~> 0.1)
+ oauth2 (1.4.0)
+ faraday (>= 0.8, < 0.13)
+ jwt (~> 1.0)
multi_json (~> 1.3)
+ multi_xml (~> 0.5)
+ rack (>= 1.2, < 3)
okcomputer (1.17.2)
openseadragon (0.5.0)
rails (> 3.2.0)
@@ -441,7 +444,7 @@ GEM
ast (~> 2.4.0)
parslet (1.8.2)
powerpack (0.1.2)
- public_suffix (3.0.2)
+ public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.5)
rack-accept (0.4.5)
diff --git a/config/locales/spotlight.zh.yml b/config/locales/spotlight.zh.yml
deleted file mode 100644
index 9929c96d5..000000000
--- a/config/locales/spotlight.zh.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-zh:
- activemodel:
- attributes:
- spotlight/contact_form:
- email: 电邮地址
- message: 邮件
- name: 姓名
- helpers:
- action:
- cancel: 取消
- submit:
- contact_form:
- create: 发送
- created: 谢谢。您的信息已经发送。
- spotlight:
- about_pages:
- contacts:
- header: 联系人
- header_links:
- contact: 反馈
- shared:
- report_a_problem:
- honeypot_field_explanation: 请勿使用这个对话框。此为防范垃圾邮件设置。如填入信息，该邮件将不会被发送。
- title: 联系我们
- browse:
- search:
- item_count:
- one: "%{count} 资料"
- other: "%{count} 资料"
- search_box:
- label: 检索该类资料
- placeholder: 检索
- reset: 清除
- submit: 检索所有资料
- success:
- expand_html: 您也可检索所有资料 "%{browse_query}".
- result_number_html: 您的检索在本专题 %{search_size} of %{parent_search_count} 条资料中检索到 条.
- zero_results:
- expand_html: 您可取消本次专题检索 或检索所有资料 "%{browse_query}".
- result_number: 找到0条结果
diff --git a/db/migrate/20180814221815_change_paper_trail_versions_object_column_to_medium_text.rb b/db/migrate/20180814221815_change_paper_trail_versions_object_column_to_medium_text.rb
new file mode 100644
index 000000000..339863d4c
--- /dev/null
+++ b/db/migrate/20180814221815_change_paper_trail_versions_object_column_to_medium_text.rb
@@ -0,0 +1,11 @@
+##
+# A migration that updates the object column size on PaperTrail's version table
+# This is in a generator template because our migrations run before PaperTrail is installed
+class ChangePaperTrailVersionsObjectColumnToMediumText < ActiveRecord::Migration[5.1]
+ # See https://github.com/paper-trail-gem/paper_trail/blob/6c34a3dd5a5f8c1b042f458b7727c9d3bbf81a50/lib/generators/paper_trail/install/templates/create_versions.rb.erb#L5-L17
+ # for rationale of the 1,073,741,823 byte limit
+
+ def change
+ change_column :versions, :object, :text, limit: 1_073_741_823
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 71c086694..686e1a33e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2018_05_31_002412) do
+ActiveRecord::Schema.define(version: 2018_08_14_221815) do
create_table "bibliography_services", force: :cascade do |t|
t.string "header"
@@ -428,7 +428,7 @@
t.integer "item_id", null: false
t.string "event", null: false
t.string "whodunnit"
- t.text "object"
+ t.text "object", limit: 1073741823
t.datetime "created_at"
t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
end