Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/master' into st_dh_issue…
Browse files Browse the repository at this point in the history
…_186

# Conflicts:
#	microsetta_private_api/templates/account_overview.jinja2
#	microsetta_private_api/templates/sample.jinja2
  • Loading branch information
dhakim87 committed Jun 12, 2020
2 parents 62c1a81 + 15300b6 commit 8c365e1
Show file tree
Hide file tree
Showing 55 changed files with 34,478 additions and 20,775 deletions.
4 changes: 2 additions & 2 deletions microsetta_private_api/api/microsetta_private_api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1250,14 +1250,14 @@ components:
description: Client url to which the customized consent form should be posted.
schema:
type: string
example: "https://www.microsetta.org/workflow_create_human_source"
example: "https://www.microsetta.org/accounts/72d2cc55-8522-4528-a85b-78be2ec0933f/create_human_source"
survey_redirect_url:
name: survey_redirect_url
in: query
description: Url that some external surveys will redirect browser to after survey completion
schema:
type: string
example: "https://www.microsetta.org/workflow_create_human_source"
example: "https://www.microsetta.org/accounts/72d2cc55-8522-4528-a85b-78be2ec0933f/sources/bfed3a1b-0855-4dce-9398-7c54f5b4ac8f"
source_type:
name: source_type
in: query
Expand Down

0 comments on commit 8c365e1

Please sign in to comment.