Ranaming master branch to main.
#436
Open
Conversation
This file contains hidden or 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
robkooper
requested changes
Nov 30, 2023
robkooper
reviewed
Nov 30, 2023
| @@ -5,7 +5,7 @@ below. By participating in this project, you agree to abide by the [code of cond | |||
| Before your code can be accepted, you will have to sign a [CLA](https://clowderframework.org/pdf/Clowder-CLA.pdf) | |||
| and mail it to [email protected]. | |||
|
|
|||
| Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `master` and `develop` branches are pushed to | |||
| Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `` and `develop` branches are pushed to | |||
robkooper
reviewed
Nov 30, 2023
| @@ -85,7 +85,7 @@ Next we install the script that will install or update clowder. | |||
| cat > /home/browndog/update-clowder.sh << EOF | |||
| #!/bin/bash | |||
|
|
|||
| # CATS-WWW (master) is the main branch for this server | |||
| # CATS-WWW () is the main branch for this server | |||
| @@ -12,4 +12,4 @@ Previewer can work together with extractors and external services. | |||
|
|
|||
|
|
|||
| Here is a list of previewer embedded with the core | |||
| `source <https://github.com/clowder-framework/clowder/tree/master/public/javascripts/previewers>`_. | |||
| `source <https://github.com/clowder-framework/clowder/tree//public/javascripts/previewers>`_. | |||
| @@ -25,7 +25,7 @@ be customized and deployed on your own cloud. | |||
| `NCSA Opensource <https://opensource.ncsa.illinois.edu/projects/CATS>`_. A copy of the source code can also be found | |||
| on `GitHub <https://github.com/clowder-framework>`_. | |||
|
|
|||
| * We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob/master/CONTRIBUTING.md>`_. | |||
| * We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob//CONTRIBUTING.md>`_. | |||
| @@ -18,7 +18,7 @@ object ApplicationBuild extends Build { | |||
|
|
|||
| def appVersion: String = { | |||
| gitBranchName match { | |||
| case "master" => getVersion | |||
| case "" => getVersion | |||
| @@ -16,7 +16,7 @@ info: | |||
| url: https://clowder.ncsa.illinois.edu/clowder/email | |||
| license: | |||
| name: The University of Illinois/NCSA Open Source License (NCSA) | |||
| url: https://github.com/clowder-framework/clowder/blob/master/LICENSE | |||
| url: https://github.com/clowder-framework/clowder/blob//LICENSE | |||
|
|
|||
There was a problem hiding this comment.
should this be main? or only / not //
| @@ -19,7 +19,7 @@ BRANCH=${BRANCH:-"$(git rev-parse --abbrev-ref HEAD)"} | |||
| BRANCH=${BRANCH} VERSION=${TMPVERSION} DEBUG=${DEBUG} $(dirname $0)/docker.sh | |||
|
|
|||
| # find out the version | |||
| if [ "${BRANCH}" = "master" ]; then | |||
| if [ "${BRANCH}" = "" ]; then | |||
| @@ -4,7 +4,7 @@ | |||
| set -e | |||
|
|
|||
| # can use the following to push to isda-registry for testing: | |||
| # BRANCH="master" SERVER=isda-registry.ncsa.illinois.edu/ ./release.sh | |||
| # BRANCH="" SERVER=isda-registry.ncsa.illinois.edu/ ./release.sh | |||
* Ranaming `master` branch to `main`. * Update GitHub Actions to latest versions Upgraded various GitHub Actions in ci.yml, docker.yml, and swagger.yml to their latest major versions for improved security and maintenance. Also updated environment variable naming and DockerHub description action usage in docker.yml for consistency and compatibility. * fix resolvers small tweak to dockerfile to remove warning * second reference to as in dockerfile * another location where typesafe has wrong url * Remove iRods integration: delete iRods storage service, plugin, config, and docs. Update changelog. Users must use another storage backend (filesystem, MongoDB GridFS, or AWS S3). * remove typesafe references from jar file * Fix upload artifact * more version bumps * fix python version --------- Co-authored-by: Luigi Marini <[email protected]>
* Ranaming `master` branch to `main`. * Escape space name and description to avoid xss. * Comment out irods dependency as it is not available anymore. * Upgrade actions/cache from v1 to v3
…miniList templates (#460) - Add user existence checks before accessing user properties in app/views/spaces/listSpaces.scala.html and app/views/spaces/miniList.scala.html - Update CHANGELOG.md with details of the fix in Unreleased section Co-authored-by: Luigi Marini <[email protected]>
Release/v1.23.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Will just delete master and keep this branch.