Compare commits

..

No commits in common. '61477f1c2d9f0d4b6cd2a87c1c8534cf2a9131e4' and '392ce0505e253f20d8f4453c2c39787ca75d14dd' have entirely different histories.

  1. 6
      Gemfile.lock
  2. 2
      app/models/form.rb
  3. 5
      db/migrate/20260713105230_allow_null_role_in_download_records.rb
  4. 4
      db/schema.rb
  5. 6
      yarn.lock

6
Gemfile.lock

@ -278,7 +278,7 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
logger (1.7.0) logger (1.7.0)
loofah (2.25.2) loofah (2.25.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.12.0) nokogiri (>= 1.12.0)
mail (2.8.1) mail (2.8.1)
@ -391,8 +391,8 @@ GEM
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
minitest minitest
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.7.1) rails-html-sanitizer (1.7.0)
loofah (~> 2.25, >= 2.25.2) loofah (~> 2.25)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails_admin (3.3.0) rails_admin (3.3.0)
activemodel-serializers-xml (>= 1.0) activemodel-serializers-xml (>= 1.0)

2
app/models/form.rb

@ -22,7 +22,7 @@ class Form
2025 => { 2025 => {
submission_deadline: Time.zone.local(2026, 6, 5), submission_deadline: Time.zone.local(2026, 6, 5),
new_logs_end_date: Time.zone.local(2026, 7, 12), new_logs_end_date: Time.zone.local(2026, 7, 12),
edit_end_date: Time.zone.local(2026, 9, 1), edit_end_date: Time.zone.local(2026, 8, 1),
}, },
2026 => { 2026 => {
submission_deadline: Time.zone.local(2027, 6, 4), submission_deadline: Time.zone.local(2027, 6, 4),

5
db/migrate/20260713105230_allow_null_role_in_download_records.rb

@ -1,5 +0,0 @@
class AllowNullRoleInDownloadRecords < ActiveRecord::Migration[7.2]
def change
change_column_null :download_records, :user_role, true
end
end

4
db/schema.rb

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.2].define(version: 2026_07_13_105230) do ActiveRecord::Schema[7.2].define(version: 2026_06_18_101455) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -111,7 +111,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_07_13_105230) do
t.string "download_filters", null: false t.string "download_filters", null: false
t.bigint "user_id", null: false t.bigint "user_id", null: false
t.bigint "user_organisation_id", null: false t.bigint "user_organisation_id", null: false
t.integer "user_role" t.integer "user_role", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.datetime "updated_at", null: false t.datetime "updated_at", null: false
t.index ["user_id"], name: "index_download_records_on_user_id" t.index ["user_id"], name: "index_download_records_on_user_id"

6
yarn.lock

@ -1727,9 +1727,9 @@ bootstrap@^5.1.3:
integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg== integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==
brace-expansion@^1.1.7: brace-expansion@^1.1.7:
version "1.1.16" version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.16.tgz#723d3a30c0558c225abc9fc479a73e14e26c3c2f" resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
integrity sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw== integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
dependencies: dependencies:
balanced-match "^1.0.0" balanced-match "^1.0.0"
concat-map "0.0.1" concat-map "0.0.1"

Loading…
Cancel
Save