gitea/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-06-23 06:28:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare branches, commits and tags with each other (#6991)

Browse Source 
* Supports tags when comparing commits or branches

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Hide headline when only comparing and don't load unused data

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Merges compare logics to allow comparing branches, commits and tags with eachother

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Display branch or tag instead of commit when used for comparing

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Show pull request form after click on button

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Transfers relevant pull.go changes from master to compare.go

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Fixes error when comparing forks against a commit or tag

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Removes console.log from JavaScript file

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Show icon next to commit reference when comparing branch or tag

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Updates css file

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Fixes import order

* Renames template variable

* Update routers/repo/compare.go

Co-Authored-By: zeripath <art27@cantab.net>

* Update from master

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Allow short-shas in compare

* Renames prInfo to compareInfo

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Check PR permissions only if compare is pull request

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Adjusts comment

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Use compareInfo instead of prInfo
This commit is contained in:
Mario Lubenka
2019-06-07 22:29:29 +02:00
committed by techknowlogick
parent bd55f6ff36
commit 311ce2d1d0
17 changed files with 584 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/css/index.css
View File

@ -591,6 +591,7 @@ footer .ui.left,footer .ui.right{line-height:40px}
.repository .milestone.list>.item .content{padding-top:10px}
.repository.new.milestone textarea{height:200px}
.repository.new.milestone #deadline{width:150px}
.repository.compare.pull .show-form-container{text-align:left}
.repository.compare.pull .choose.branch .octicon{padding-right:10px}
.repository.compare.pull .comment.form .content:after,.repository.compare.pull .comment.form .content:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}
.repository.compare.pull .comment.form .content:before{border-right-color:#d3d3d4;border-width:9px;margin-top:-9px}

9
public/js/index.js
View File

@ -959,8 +959,15 @@ function initRepository() {
});
// Pull request
if ($('.repository.compare.pull').length > 0) {
var $repoComparePull = $('.repository.compare.pull');
if ($repoComparePull.length > 0) {
initFilterSearchDropdown('.choose.branch .dropdown');
// show pull request form
$repoComparePull.find('button.show-form').on('click', function(e) {
e.preventDefault();
$repoComparePull.find('.pullrequest-form').show();
$(this).parent().hide();
});
}
// Branches

3
public/less/_repository.less
View File

@ -1109,6 +1109,9 @@
}
&.compare.pull {
.show-form-container {
text-align: left;
}
.choose.branch {
.octicon {
padding-right: 10px;