codection-admin/gitea
1
0
Fork 0
Code Issues 1 Discussions 3 Pull Requests Actions Packages Projects Releases Wiki Activity
8ac1501ad7
gitea/templates/repo
History
Lauris BH 8ac1501ad7
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 
* 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
2018-01-05 20:56:50 +02:00
..
branch Refactor struct's time to remove unnecessary memory usage (#3142) 2017-12-11 06:37:04 +02:00
diff Responsive view (#2750) 2017-12-30 18:47:52 -06:00
editor Make URL scheme unambiguous (#2408) 2017-10-30 10:04:25 +08:00
issue Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
pulls Responsive view (#2750) 2017-12-30 18:47:52 -06:00
release fix source download link when no code unit allowed (#3166) 2017-12-12 08:45:02 +02:00
settings Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
wiki Responsive view (#2750) 2017-12-30 18:47:52 -06:00
activity.tmpl Refactor struct's time to remove unnecessary memory usage (#3142) 2017-12-11 06:37:04 +02:00
bare.tmpl Only show SSH clone URL if signed in (#2169) (#2170) 2017-07-15 22:21:51 +08:00
branch_dropdown.tmpl Adjust branch button size (#3063) 2017-12-02 19:57:51 +02:00
commit_status.tmpl Spaces to tabs in templates (#2953) 2017-11-21 13:43:00 +08:00
commits_table.tmpl Responsive view (#2750) 2017-12-30 18:47:52 -06:00
commits.tmpl Responsive view (#2750) 2017-12-30 18:47:52 -06:00
create.tmpl Dropped link to Gogs docs from template 2016-11-07 14:49:25 +01:00
forks.tmpl #3348 always use relative avatar link in the template 2016-08-05 12:12:54 -07:00
graph.tmpl Fix issue link rendering in commit messages (#2897) 2017-11-13 09:35:55 +08:00
header.tmpl Responsive view (#2750) 2017-12-30 18:47:52 -06:00
home.tmpl Responsive view (#2750) 2017-12-30 18:47:52 -06:00
migrate.tmpl Add notice that LFS mirroring is not supported (#1251) 2017-03-16 19:33:22 +08:00
search.tmpl Code/repo search (#2582) 2017-10-27 09:10:54 +03:00
sub_menu.tmpl Minor copy changes (#3074) 2017-12-03 22:52:30 +02:00
user_cards.tmpl Refactor struct's time to remove unnecessary memory usage (#3142) 2017-12-11 06:37:04 +02:00
view_file.tmpl Responsive view (#2750) 2017-12-30 18:47:52 -06:00
view_list.tmpl Expandable commit bodies (#2980) 2017-11-30 13:08:40 +08:00
watchers.tmpl #1692 APIs: Users Followers 2015-12-21 04:24:11 -08:00