Skip to content

Add DefaultMergeStyle option to repository #14789

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

Merged
merged 13 commits into from
Mar 27, 2021
Merged

Add DefaultMergeStyle option to repository #14789

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1ce4557
Add DefaultMergeStyle option to repository
parnic Feb 24, 2021
af12149
Fix missing migration - satisfy linter
parnic Feb 24, 2021
0de9098
Update to latest formatting
parnic Feb 24, 2021
7d7fc58
Update swagger
parnic Feb 24, 2021
70dd7e4
Remove migration
parnic Feb 25, 2021
750838f
Merge branch 'master' into add-default-merge-style
parnic Mar 5, 2021
e9ba177
Fix whitespace from GitHub merge
parnic Mar 5, 2021
b598ee4
Merge branch 'master' into add-default-merge-style
lafriks Mar 7, 2021
b77dab6
Merge branch 'master' into add-default-merge-style
parnic Mar 17, 2021
3b79b0a
Fix whitespace after GitHub merge
parnic Mar 17, 2021
fabe121
Merge branch 'master' into add-default-merge-style
techknowlogick Mar 18, 2021
618fb87
Merge branch 'master' into add-default-merge-style
lunny Mar 18, 2021
fea0e26
Merge branch 'master' into add-default-merge-style
6543 Mar 27, 2021
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
Prev Previous commit
Next Next commit
Fix whitespace from GitHub merge
  • Loading branch information
@parnic
parnic committed Mar 5, 2021
commit e9ba177db1436d094416e5da09260abf37a09866
6 changes: 3 additions & 3 deletions templates/repo/settings/options.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@
</div>
</div>
<div class="field">
<p>
<p>
{{.i18n.Tr "repo.settings.default_merge_style_desc"}}
</p>
<div class="ui dropdown selection" tabindex="0">
Expand Down Expand Up @@ -373,8 +373,8 @@
<div class="item" data-value="rebase-merge">{{.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
<div class="item" data-value="squash">{{.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div>
</div>
</div>
</div>
</div>
</div>
</div>
{{end}}

Expand Down