luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-15 06:22:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)

Browse source 
* Pull request options migration and UI in settings

* Add ignore whitespace functionality

* Fix settings if pull requests are disabled

* Fix migration transaction

* Merge with Rebase functionality

* UI changes and related functionality for pull request merging button

* Implement squash functionality

* Fix rebase merging

* Fix pull request merge tests

* Add squash and rebase tests

* Fix API method to reuse default message functions

* Some refactoring and small fixes

* Remove more hardcoded values from tests

* Remove unneeded check from API method

* Fix variable name and comment typo

* Fix reset commit count after PR merge
This commit is contained in:
Lauris BH 2018-01-05 20:56:50 +02:00 • committed by GitHub
parent a192f3052e
commit 8ac1501ad7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 529 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

22
public/js/index.js
View file

@ -649,6 +649,28 @@ function initRepository() {
$('#status').val($statusButton.data('status-val'));
$('#comment-form').submit();
});
// Pull Request merge button
var $mergeButton = $('.merge-button > button');
$mergeButton.on('click', function(e) {
e.preventDefault();
$('.' + $(this).data('do') + '-fields').show();
$(this).parent().hide();
});
$('.merge-button > .dropdown').dropdown({
onChange: function (text, value, $choice) {
if ($choice.data('do')) {
$mergeButton.find('.button-text').text($choice.text());
$mergeButton.data('do', $choice.data('do'));
}
}
});
$('.merge-cancel').on('click', function(e) {
e.preventDefault();
$(this).closest('.form').hide();
$mergeButton.parent().show();
});
initReactionSelector();
}