Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build(deps): Bump sidekiq from 6.1.3 to 6.2.1 #64

Closed
wants to merge 3 commits into from
Closed

Build(deps): Bump sidekiq from 6.1.3 to 6.2.1 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b30c7a7
Bump max_category_nesting default max value to 7
enduvar Oct 27, 2020
bde0bab
Remove hardcoded limit from slug building function
enduvar Oct 27, 2020
6315f27
Build(deps): Bump sidekiq from 6.1.3 to 6.2.1
dependabot[bot] Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ GEM
activesupport (>= 3.1)
shoulda-matchers (4.5.1)
activesupport (>= 4.2.0)
sidekiq (6.2.0)
sidekiq (6.2.1)
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
Expand Down
11 changes: 7 additions & 4 deletions app/assets/javascripts/discourse/app/models/category.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,17 +335,20 @@ Category.reopenClass({
return _uncategorized;
},

slugFor(category, separator = "/", depth = 3) {
slugFor(category, separator = "/", depth) {
if (!category) {
return "";
}

const parentCategory = get(category, "parentCategory");
let result = "";

if (parentCategory && depth > 1) {
result =
Category.slugFor(parentCategory, separator, depth - 1) + separator;
if (parentCategory) {
if (typeof depth === 'undefined') {
result = Category.slugFor(parentCategory, separator) + separator;
} else if (depth > 1) {
result = Category.slugFor(parentCategory, separator, depth - 1) + separator;
}
}

const id = get(category, "id"),
Expand Down
2 changes: 1 addition & 1 deletion config/site_settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ basic:
client: true
default: 2
min: 2
max: 3
max: 7
hidden: true
enable_mobile_theme:
client: true
Expand Down