Skip to content

Commit

Permalink
Merge branch 'master' into mayday
Browse files Browse the repository at this point in the history
  • Loading branch information
arunmathaisk authored Jan 2, 2025
2 parents 8b532af + 35ddeb7 commit 53bdd96
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@
"jemalloc",
"nofail",
"earlyoom",
"sysrq"
"sysrq",
"redisearch",
"notin"
],
"allowCompoundWords": true,
"ignorePaths": [
Expand Down
8 changes: 4 additions & 4 deletions press/press/doctype/release_group/release_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def validate(self):
self.validate_feature_flags()

def before_insert(self):
# to avoid ading deps while cloning a release group
# to avoid adding deps while cloning a release group
if len(self.dependencies) == 0:
self.fetch_dependencies()
self.set_default_app_cache_flags()
Expand Down Expand Up @@ -258,7 +258,7 @@ def before_save(self):
self.update_common_site_config_preview()

def update_common_site_config_preview(self):
"""Regenerates rg.common_site_config on each rg.befor_save
"""Regenerates rg.common_site_config on each rg.before_save
from the rg.common_site_config child table data"""
new_config = {}

Expand Down Expand Up @@ -1340,7 +1340,7 @@ def is_version_14_or_higher(self):
return frappe.get_cached_value("Frappe Version", self.version, "number") >= 14

def setup_default_feature_flags(self):
DETAULT_FEATURE_FLAGS = {
DEFAULT_FEATURE_FLAGS = {
"Version 14": {"merge_default_and_short_rq_queues": True},
"Version 15": {
"gunicorn_threads_per_worker": "4",
Expand All @@ -1353,7 +1353,7 @@ def setup_default_feature_flags(self):
"use_rq_workerpool": True,
},
}
flags = DETAULT_FEATURE_FLAGS[self.version]
flags = DEFAULT_FEATURE_FLAGS.get(self.version, {})
for key, value in flags.items():
setattr(self, key, value)

Expand Down

0 comments on commit 53bdd96

Please sign in to comment.