DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4515 from tchak/bump-activestorage-openstack

Browse source 
Bump rails and activestorage-openstack
This commit is contained in:
Paul Chavard 2019-11-13 15:53:31 +01:00 committed by GitHub
commit f2181b767c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 54 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
Gemfile.lock
View file

@ -20,25 +20,25 @@ GEM
specs: specs:
aasm (5.0.1) aasm (5.0.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
actioncable (5.2.2.1) actioncable (5.2.3)
actionpack (= 5.2.2.1) actionpack (= 5.2.3)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailer (5.2.2.1) actionmailer (5.2.3)
actionpack (= 5.2.2.1) actionpack (= 5.2.3)
actionview (= 5.2.2.1) actionview (= 5.2.3)
activejob (= 5.2.2.1) activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.2.2.1) actionpack (5.2.3)
actionview (= 5.2.2.1) actionview (= 5.2.3)
activesupport (= 5.2.2.1) activesupport (= 5.2.3)
rack (~> 2.0) rack (~> 2.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.2.1) actionview (5.2.3)
activesupport (= 5.2.2.1) activesupport (= 5.2.3)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
@ -51,25 +51,25 @@ GEM
activemodel (>= 4.1, < 6) activemodel (>= 4.1, < 6)
case_transform (>= 0.2) case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3) jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (5.2.2.1) activejob (5.2.3)
activesupport (= 5.2.2.1) activesupport (= 5.2.3)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.2.2.1) activemodel (5.2.3)
activesupport (= 5.2.2.1) activesupport (= 5.2.3)
activerecord (5.2.2.1) activerecord (5.2.3)
activemodel (= 5.2.2.1) activemodel (= 5.2.3)
activesupport (= 5.2.2.1) activesupport (= 5.2.3)
arel (>= 9.0) arel (>= 9.0)
activestorage (5.2.2.1) activestorage (5.2.3)
actionpack (= 5.2.2.1) actionpack (= 5.2.3)
activerecord (= 5.2.2.1) activerecord (= 5.2.3)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activestorage-openstack (1.0.0) activestorage-openstack (1.2.0)
fog-openstack (~> 1.0) fog-openstack (~> 1.0)
marcel marcel
mime-types mime-types
rails (<= 6) rails (>= 5.2.2)
activesupport (5.2.2.1) activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -196,7 +196,7 @@ GEM
em-websocket (0.5.1) em-websocket (0.5.1)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
erubi (1.8.0) erubi (1.9.0)
erubis (2.7.0) erubis (2.7.0)
ethon (0.11.0) ethon (0.11.0)
ffi (>= 1.3.0) ffi (>= 1.3.0)
@ -304,7 +304,7 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.6.0) i18n (1.7.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
ipaddress (0.8.3) ipaddress (0.8.3)
jaro_winkler (1.5.2) jaro_winkler (1.5.2)
@ -368,7 +368,7 @@ GEM
mimemagic (0.3.3) mimemagic (0.3.3)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.11.3) minitest (5.13.0)
momentjs-rails (2.20.1) momentjs-rails (2.20.1)
railties (>= 3.1) railties (>= 3.1)
multi_json (1.14.1) multi_json (1.14.1)
@ -377,7 +377,7 @@ GEM
mustermann (1.0.3) mustermann (1.0.3)
nenv (0.3.0) nenv (0.3.0)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.3.1) nio4r (2.5.2)
nokogiri (1.10.5) nokogiri (1.10.5)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
notiffany (0.1.1) notiffany (0.1.1)
@ -462,18 +462,18 @@ GEM
rack rack
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.2.2.1) rails (5.2.3)
actioncable (= 5.2.2.1) actioncable (= 5.2.3)
actionmailer (= 5.2.2.1) actionmailer (= 5.2.3)
actionpack (= 5.2.2.1) actionpack (= 5.2.3)
actionview (= 5.2.2.1) actionview (= 5.2.3)
activejob (= 5.2.2.1) activejob (= 5.2.3)
activemodel (= 5.2.2.1) activemodel (= 5.2.3)
activerecord (= 5.2.2.1) activerecord (= 5.2.3)
activestorage (= 5.2.2.1) activestorage (= 5.2.3)
activesupport (= 5.2.2.1) activesupport (= 5.2.3)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.2.2.1) railties (= 5.2.3)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4) rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x) actionpack (>= 5.0.1.x)
@ -482,14 +482,14 @@ GEM
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.2.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.2, >= 2.2.2) loofah (~> 2.3)
rails-i18n (5.1.2) rails-i18n (5.1.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 5.0, < 6) railties (>= 5.0, < 6)
railties (5.2.2.1) railties (5.2.3)
actionpack (= 5.2.2.1) actionpack (= 5.2.3)
activesupport (= 5.2.2.1) activesupport (= 5.2.3)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0) thor (>= 0.19.0, < 2.0)
@ -686,9 +686,9 @@ GEM
activesupport (>= 4.2) activesupport (>= 4.2)
rack-proxy (>= 0.6.1) rack-proxy (>= 0.6.1)
railties (>= 4.2) railties (>= 4.2)
websocket-driver (0.7.0) websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3) websocket-extensions (0.1.4)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
xray-rails (0.3.1) xray-rails (0.3.1)

2
app/controllers/instructeurs/groupe_instructeurs_controller.rb
View file

@ -14,7 +14,7 @@ module Instructeurs
end end
def add_instructeur def add_instructeur
@instructeur = Instructeur.find_by(email: instructeur_email) || @instructeur = Instructeur.by_email(instructeur_email) ||
create_instructeur(instructeur_email) create_instructeur(instructeur_email)
if groupe_instructeur.instructeurs.include?(@instructeur) if groupe_instructeur.instructeurs.include?(@instructeur)

2
app/controllers/new_administrateur/groupe_instructeurs_controller.rb
View file

@ -47,7 +47,7 @@ module NewAdministrateur
end end
def add_instructeur def add_instructeur
@instructeur = Instructeur.find_by(email: instructeur_email) || @instructeur = Instructeur.by_email(instructeur_email) ||
create_instructeur(instructeur_email) create_instructeur(instructeur_email)
if groupe_instructeur.instructeurs.include?(@instructeur) if groupe_instructeur.instructeurs.include?(@instructeur)

4
app/lib/active_storage/file_not_found_error.rb
View file

@ -1,4 +0,0 @@
module ActiveStorage
# activestorage-openstack uses ActiveStorage::FileNotFoundError which only exists in rails 6
class FileNotFoundError < StandardError; end
end

5
db/migrate/20191113142816_instructeurs_remove_email.rb Normal file
View file

@ -0,0 +1,5 @@
class InstructeursRemoveEmail < ActiveRecord::Migration[5.2]
def change
remove_column :instructeurs, :email
end
end

4
db/schema.rb
View file

@ -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.define(version: 2019_10_24_150452) do ActiveRecord::Schema.define(version: 2019_11_13_142816) 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"
@ -414,12 +414,10 @@ ActiveRecord::Schema.define(version: 2019_10_24_150452) do
end end
create_table "instructeurs", id: :serial, force: :cascade do |t| create_table "instructeurs", id: :serial, force: :cascade do |t|
t.string "email", default: "", null: false
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.text "encrypted_login_token" t.text "encrypted_login_token"
t.datetime "login_token_created_at" t.datetime "login_token_created_at"
t.index ["email"], name: "index_instructeurs_on_email"
end end
create_table "invites", id: :serial, force: :cascade do |t| create_table "invites", id: :serial, force: :cascade do |t|