Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5fdbc53
Merge pull request #14 from impactoss/master
tmfrnz Nov 6, 2018
fda894d
Merge remote-tracking branch 'upstream/master' into v2.0
tmfrnz Jan 11, 2021
41d562a
add SDS, disable categories
tmfrnz Jan 11, 2021
a14502d
reduce cluster priority
tmfrnz Jan 11, 2021
5dc9f13
set up sds categories
tmfrnz Jan 12, 2021
bb9d084
also set empties to prevent random values
tmfrnz Jan 12, 2021
b2474f1
Merge pull request #16 from impactoss/master
tmfrnz Jun 26, 2021
702cf08
Merge pull request #17 from nmrf/v2.0
tmfrnz Jun 27, 2021
01c7a33
add sjukkola
tmfrnz Jun 27, 2021
285de2e
update seeds file
tmfrnz Jul 18, 2021
7826dfc
specify migration version
tmfrnz Jul 18, 2021
1d0782f
fix seeds file
tmfrnz Jul 18, 2021
a632ea7
cleanup seeds file
tmfrnz Jul 18, 2021
d64ab78
fix seeds
tmfrnz Jul 18, 2021
7c4a50c
try category instead of parent
tmfrnz Jul 18, 2021
10ee4bd
replace parent with category
tmfrnz Jul 18, 2021
27efcd9
add allow_password_change field
tmfrnz Jul 18, 2021
cb9fc3e
test cors header
tmfrnz Feb 26, 2024
87fbfa0
test cors header 2
tmfrnz Feb 26, 2024
33e8ab8
test cors header 3
tmfrnz Feb 26, 2024
8ec1240
test cors header 4
tmfrnz Feb 26, 2024
64f74cc
try multiple origins, incl localhost
tmfrnz Feb 27, 2024
1e8ad25
add prod origins
tmfrnz Feb 27, 2024
5d542b0
try multiple origins
tmfrnz Mar 1, 2024
4264821
try multiple origins - fix typo
tmfrnz Mar 1, 2024
b540dba
try multiple origins - 2
tmfrnz Mar 1, 2024
49b8b10
use environment variable
tmfrnz Mar 1, 2024
8704ec9
use environment variable, multiple
tmfrnz Mar 1, 2024
1c2b34c
Merge pull request #20 from nmrf/test-fog
tmfrnz Mar 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
- Br3nda
- keyaral
- oventi
- barancw
- nrankin
- barancw
- parndt
- ben-rabid
- sjukkola
2 changes: 1 addition & 1 deletion app/controllers/s3_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ def sign

render json: {signedUrl: url}
end
end
end
13 changes: 12 additions & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,20 @@ class Application < Rails::Application
config.active_record.default_timezone = :local

config.middleware.insert_before 0, Rack::Cors do
allow do
origins ENV['ALLOWED_ORIGIN_S3'].split(',').map { |origin| origin.strip }
resource '/s3/*',
headers: :any,
methods: :any,
expose: ['access-token', 'expiry', 'token-type', 'uid', 'client'],
credentials: true
end
allow do
origins '*'
resource '*', headers: :any, methods: :any, expose: ['access-token', 'expiry', 'token-type', 'uid', 'client']
resource '*',
headers: :any,
methods: :any,
expose: ['access-token', 'expiry', 'token-type', 'uid', 'client']
end
end

Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20170107173635_create_versions.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This migration creates the `versions` table, the only schema PT requires.
# All other migrations PT provides are optional.
class CreateVersions < ActiveRecord::Migration
class CreateVersions < ActiveRecord::Migration[5.0]
# Class names of MySQL adapters.
# - `MysqlAdapter` - Used by gems: `mysql`, `activerecord-jdbcmysql-adapter`.
# - `Mysql2Adapter` - Used by `mysql2` gem.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddAllowPasswordChangeToUsers < ActiveRecord::Migration[5.0]
def change
add_column :users, :allow_password_change, :boolean, default: true
end
end
3 changes: 2 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20201213232312) do
ActiveRecord::Schema.define(version: 20210718153206) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
Expand Down Expand Up @@ -310,6 +310,7 @@
t.string "uid", default: "", null: false
t.json "tokens"
t.integer "last_modified_user_id"
t.boolean "allow_password_change", default: true
t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
end
Expand Down
Loading