Skip to content

Commit

Permalink
Merge pull request #18076 from tianzedavid/dev
Browse files Browse the repository at this point in the history
chore: remove repetitive words
  • Loading branch information
nsoranzo authored May 3, 2024
2 parents fa2afe8 + 04bfa20 commit 33011b2
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion client/src/components/Panels/FlexPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ watch(position, () => {
});
});
/** If the the `maxWidth` changes, prevent the panel from exceeding it */
/** If the `maxWidth` changes, prevent the panel from exceeding it */
watch(
() => props.maxWidth,
(newVal) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function onViewObjectStore(objectStoreId: string) {
v-if="objectStoresBySizeData"
:description="
localize(
`This graph displays how your Galaxy data is stored sorted into the the object store is stored in. Click on a bar to see more information about the object store.`
`This graph displays how your Galaxy data is stored sorted into the object store is stored in. Click on a bar to see more information about the object store.`
)
"
:data="objectStoresBySizeData"
Expand Down
2 changes: 1 addition & 1 deletion client/src/libs/jquery/jquery.dynatree.js
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@ DynaTreeNode.prototype = {
callback.call(tree, child, "error");
}
});
// we can ignore it, since it will only be exectuted once, the the loop is ended
// we can ignore it, since it will only be executed once, the loop is ended
// See also http://stackoverflow.com/questions/3037598/how-to-get-around-the-jslint-error-dont-make-functions-within-a-loop
} else {
callback.call(tree, child, "loaded");
Expand Down
2 changes: 1 addition & 1 deletion doc/source/admin/galaxy_options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2156,7 +2156,7 @@
Allow import of workflows from the TRS servers configured in the
specified YAML or JSON file. The file should be a list with 'id',
'label', and 'api_url' for each entry. Optionally, 'link_url' and
'doc' may be be specified as well for each entry.
'doc' may be specified as well for each entry.
If this is null (the default), a simple configuration containing
just Dockstore will be used.
The value of this option will be resolved with respect to
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/config/sample/galaxy.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ galaxy:
# Allow import of workflows from the TRS servers configured in the
# specified YAML or JSON file. The file should be a list with 'id',
# 'label', and 'api_url' for each entry. Optionally, 'link_url' and
# 'doc' may be be specified as well for each entry.
# 'doc' may be specified as well for each entry.
# If this is null (the default), a simple configuration containing
# just Dockstore will be used.
# The value of this option will be resolved with respect to
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/config/schemas/config_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,7 @@ mapping:
Allow import of workflows from the TRS servers configured in
the specified YAML or JSON file. The file should be a list with
'id', 'label', and 'api_url' for each entry. Optionally,
'link_url' and 'doc' may be be specified as well for each entry.
'link_url' and 'doc' may be specified as well for each entry.
If this is null (the default), a simple configuration containing
just Dockstore will be used.
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/datatypes/binary.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

log = logging.getLogger(__name__)
# pysam 0.16.0.1 emits logs containing the word 'Error', this can confuse the stdout/stderr checkers.
# Can be be removed once https://github.com/pysam-developers/pysam/issues/939 is resolved.
# Can be removed once https://github.com/pysam-developers/pysam/issues/939 is resolved.
pysam.set_verbosity(0)

# Currently these supported binary data types must be manually set on upload
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/visualization/data_providers/genome.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#

# pysam 0.16.0.1 emits logs containing the word 'Error', this can confuse the stdout/stderr checkers.
# Can be be removed once https://github.com/pysam-developers/pysam/issues/939 is resolved.
# Can be removed once https://github.com/pysam-developers/pysam/issues/939 is resolved.
pysam.set_verbosity(0)

PAYLOAD_LIST_TYPE = List[Optional[Union[str, int, float, List[Tuple[int, int]]]]]
Expand Down

0 comments on commit 33011b2

Please sign in to comment.