diff --git a/Gemfile b/Gemfile index d1539e47f8a66ef86c1af790034da5d5b6ea36d5..b11640c898b73efc000066366ef808d523d80b98 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ gem 'rails-i18n' gem "roo", "~> 2.9" gem 'sanitize' gem 'sassc-rails' -gem 'scout_apm', '~> 5.1' +# gem 'scout_apm', '~> 5.1' gem 'sib-api-v3-sdk' gem 'simple-navigation' gem 'simple_form' diff --git a/Gemfile.lock b/Gemfile.lock index 61e390fdb9ca71933a7d2d2fe91af790abf2609c..3f61e9ea7bfff1919952e394e1a826bec34e72fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,6 @@ GEM annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) - ast (2.4.2) autoprefixer-rails (10.4.7.0) execjs (~> 2) aws-eventstream (1.2.0) @@ -330,8 +329,6 @@ GEM omniauth (~> 2.0) ruby-saml (~> 1.12) orm_adapter (0.5.0) - parser (3.1.2.0) - ast (~> 2.4.1) pg (1.4.1) popper_js (2.9.3) public_suffix (4.0.7) @@ -409,8 +406,6 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - scout_apm (5.2.0) - parser selenium-webdriver (4.3.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) @@ -537,7 +532,6 @@ DEPENDENCIES roo (~> 2.9) sanitize sassc-rails - scout_apm (~> 5.1) selenium-webdriver sib-api-v3-sdk simple-navigation @@ -558,4 +552,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.3.12 + 2.3.11 diff --git a/app/models/administration/qualiopi/indicator.rb b/app/models/administration/qualiopi/indicator.rb index 6e06a027333a734dbc6b5b039d18b1b21626969a..300286f22c2b5b35c92568f4cde1b0c4b2bd6691 100644 --- a/app/models/administration/qualiopi/indicator.rb +++ b/app/models/administration/qualiopi/indicator.rb @@ -20,7 +20,7 @@ # # Foreign Keys # -# fk_rails_eed87f7acf (criterion_id => administration_qualiopi_criterions.id) +# fk_rails_31f1a0a2c9 (criterion_id => administration_qualiopi_criterions.id) # class Administration::Qualiopi::Indicator < ApplicationRecord include Sanitizable diff --git a/app/models/communication/website.rb b/app/models/communication/website.rb index ec8ffed12ad4f46f3cac69fb9e2a8e1264d54b47..7f32cf185681e23ed00331f2f3965d38c16e1a1b 100644 --- a/app/models/communication/website.rb +++ b/app/models/communication/website.rb @@ -25,7 +25,7 @@ # # Foreign Keys # -# fk_rails_bb6a496c08 (university_id => universities.id) +# fk_rails_94b0abd85b (university_id => universities.id) # class Communication::Website < ApplicationRecord include WithUniversity diff --git a/app/models/communication/website/configs/base_url.rb b/app/models/communication/website/configs/base_url.rb index 2daeee8a29469d9f54419c721df481893f9f4e46..a28371ae484a8eea0cbfadf4b1c6a6f3d0a3b79e 100644 --- a/app/models/communication/website/configs/base_url.rb +++ b/app/models/communication/website/configs/base_url.rb @@ -25,7 +25,7 @@ # # Foreign Keys # -# fk_rails_bb6a496c08 (university_id => universities.id) +# fk_rails_94b0abd85b (university_id => universities.id) # class Communication::Website::Configs::BaseUrl < Communication::Website diff --git a/app/models/communication/website/configs/permalinks.rb b/app/models/communication/website/configs/permalinks.rb index df46d3c8fecc75aba6cf25a7418402a7e225dbca..7ba504bbb39f709ea6ef47af7825e4a2ad26d59f 100644 --- a/app/models/communication/website/configs/permalinks.rb +++ b/app/models/communication/website/configs/permalinks.rb @@ -25,7 +25,7 @@ # # Foreign Keys # -# fk_rails_bb6a496c08 (university_id => universities.id) +# fk_rails_94b0abd85b (university_id => universities.id) # class Communication::Website::Configs::Permalinks < Communication::Website diff --git a/app/models/education/program.rb b/app/models/education/program.rb index 6606cc0a800220c485453fdbf0551abdcb757c4c..8a9ebf684731b179be924b511517c6d1e4ee6620 100644 --- a/app/models/education/program.rb +++ b/app/models/education/program.rb @@ -45,7 +45,7 @@ # # Foreign Keys # -# fk_rails_08b351087c (university_id => universities.id) +# fk_rails_6e16107511 (university_id => universities.id) # fk_rails_ec1f16f607 (parent_id => education_programs.id) # class Education::Program < ApplicationRecord diff --git a/db/schema.rb b/db/schema.rb index 4f00b3b0a3e588c5ca90964c5d72ce6745413436..245ec6daeebe4d3c9be390cdb5e34965d1955d13 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -303,10 +303,10 @@ ActiveRecord::Schema.define(version: 2022_07_04_164321) do t.text "github_path" t.string "featured_image_alt" t.text "text" - t.text "description_short" t.string "breadcrumb_title" t.text "header_text" t.integer "kind" + t.text "description_short" t.string "bodyclass" t.uuid "language_id" t.text "featured_image_credit" @@ -508,23 +508,6 @@ ActiveRecord::Schema.define(version: 2022_07_04_164321) do t.index ["university_id"], name: "index_education_schools_on_university_id" end - create_table "external_organizations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.string "title" - t.text "description" - t.string "address" - t.string "zipcode" - t.string "city" - t.string "country" - t.string "website" - t.string "phone" - t.string "mail" - t.boolean "active" - t.string "sirene" - t.integer "kind" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - end - create_table "imports", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| t.integer "number_of_lines" t.jsonb "processing_errors" @@ -719,8 +702,8 @@ ActiveRecord::Schema.define(version: 2022_07_04_164321) do t.string "linkedin" t.boolean "is_alumnus", default: false t.text "description_short" - t.string "name" t.boolean "is_author" + t.string "name" t.integer "gender" t.date "birthdate" t.string "phone_professional" diff --git a/test/fixtures/communication/websites.yml b/test/fixtures/communication/websites.yml index 78817fa75f2494d30e61980d680f224d40cc6ccb..6b436633f64b74d0481604586bfe3dd4e1ae18c3 100644 --- a/test/fixtures/communication/websites.yml +++ b/test/fixtures/communication/websites.yml @@ -25,7 +25,7 @@ # # Foreign Keys # -# fk_rails_bb6a496c08 (university_id => universities.id) +# fk_rails_94b0abd85b (university_id => universities.id) # website_with_github: university: default_university