Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions base/roles/base/files/profile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ backport() {
sha=$(git rev-parse HEAD) || return 1
git fetch origin develop || return 1
git switch --detach origin/develop || return 1
git switch -c "$b" || return 1
git switch -c "$1" || return 1
git cherry-pick "$sha" || return 1
git push -u origin "$b" || return 1
git push -u origin "$1" || return 1
git switch "$cur"
}

Expand Down
2 changes: 1 addition & 1 deletion config/templates/git_app.ini.erb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ONLY_SHOW_RELEVANT_REPOS = true
EXPLORE_PAGING_DEFAULT_SORT = alphabetically

[service]
ENABLE_REGISTERATION_CAPTCHA = false
ENABLE_REGISTRATION_CAPTCHA = false
DISABLE_GRAVATAR = true
ENABLE_FEDERATED_AVATAR = false
SHOW_USER_EMAIL = false
Expand Down