-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1084 from ScilifelabDataCentre/develop
Remove xmas message and adapt to repo rename
- Loading branch information
Showing
41 changed files
with
124 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,7 +32,7 @@ jobs: | |
- name: Run Trivy vulnerability scanner | ||
uses: aquasecurity/[email protected] | ||
with: | ||
image-ref: 'ghcr.io/${{ env.REPOSITORY_OWNER }}/covid-portal:develop' | ||
image-ref: 'ghcr.io/${{ env.REPOSITORY_OWNER }}/pathogens-portal:develop' | ||
format: 'sarif' | ||
output: 'trivy-results.sarif' | ||
severity: 'CRITICAL,HIGH' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,15 +16,15 @@ __Table of contents:__ | |
|
||
## How to propose changes or additions | ||
|
||
All information displayed on the Portal is contained within [this GitHub repository](https://github.com/ScilifelabDataCentre/covid-portal). Some of the sections use information that is stored in the `data` folder in .JSON format while other sections use information that is stored in the `content` folder in Markdown format. | ||
All information displayed on the Portal is contained within [this GitHub repository](https://github.com/ScilifelabDataCentre/pathogens-portal). Some of the sections use information that is stored in the `data` folder in .JSON format while other sections use information that is stored in the `content` folder in Markdown format. | ||
|
||
### Using the web interface | ||
|
||
- Navigate to the folder and file that is indicated below in the corresponding section. | ||
- Click on the top right corner of the document ("Edit this file"). This should create a fork of the original repository in your own GitHub account. You should see a page where you can directly edit the content. | ||
- Make changes as described below; do not forget to change the last update date on top of the document if needed. | ||
- Scroll to the bottom of the page. Describe what you have changed and press 'Propose changes' | ||
- You should now find yourself on a page where you can create a pull request. Check that the pull request will be sent to the base repository `SciLifeLabDataCentre/covid-portal` and base `develop`. You can also review the changes you made. Click on "Create pull request" if everything looks good. | ||
- You should now find yourself on a page where you can create a pull request. Check that the pull request will be sent to the base repository `SciLifeLabDataCentre/pathogens-portal` and base `develop`. You can also review the changes you made. Click on "Create pull request" if everything looks good. | ||
- Once created, a member of the Portal team will review your changes. | ||
Once approved, they will be merged and published. | ||
|
||
|
@@ -33,14 +33,14 @@ Once approved, they will be merged and published. | |
If you prefer, you can edit the website files on your computer in your favourite text editor. Fork this repository to your account. Then, clone the forked repository to your machine: | ||
|
||
```bash | ||
git clone [email protected]:[YOUR-USERNAME]/covid-portal.git | ||
cd covid-portal | ||
git clone [email protected]:[YOUR-USERNAME]/pathogens-portal.git | ||
cd pathogens-portal | ||
``` | ||
|
||
To make it easier to pull in changes made by others, you can add the main repository as a remote: | ||
|
||
```bash | ||
git remote add upstream https://github.com/ScilifelabDataCentre/covid-portal.git | ||
git remote add upstream https://github.com/ScilifelabDataCentre/pathogens-portal.git | ||
``` | ||
|
||
Then you can fetch changes at any time from this remote: | ||
|
@@ -59,7 +59,7 @@ git push | |
|
||
Once you're finished with your edits and they are committed and pushed to your forked repository, it's time to open a pull request. In short: | ||
|
||
- Visit the main repository: [https://github.com/ScilifelabDataCentre/covid-portal](https://github.com/ScilifelabDataCentre/covid-portal) | ||
- Visit the main repository: [https://github.com/ScilifelabDataCentre/pathogens-portal](https://github.com/ScilifelabDataCentre/pathogens-portal) | ||
- Click the button that reads _"New Pull Request"_ | ||
- Click the text link near the top that says _"compare across forks"_ | ||
- In the right-hand _"head repository"_ drop down, select your username / fork. | ||
|
@@ -70,7 +70,7 @@ Once approved, they will be merged and published. | |
|
||
#### Testing with a local copy of the Portal | ||
|
||
Because the Portal is built on Hugo, it is quite easy to run a full version of the Portal on your computer and see how your changes look while doing that. See [this page for information on how to do that](https://github.com/ScilifelabDataCentre/covid-portal/blob/develop/CONTRIBUTING/running_a_local_copy.md). | ||
Because the Portal is built on Hugo, it is quite easy to run a full version of the Portal on your computer and see how your changes look while doing that. See [this page for information on how to do that](https://github.com/ScilifelabDataCentre/pathogens-portal/blob/develop/CONTRIBUTING/running_a_local_copy.md). | ||
|
||
## Available datasets | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.