upstream/kallithea Files · rhodecode/controllers/admin

compare: show aggregated diff of what will be merged to other repo, using merge ancestor...

compare: show aggregated diff of what will be merged to other repo, using merge ancestor pull_request.get_compare_data will also now return the ancestor that would be used for actual merging. Showing a diff from that ancestor instead of the first 'new' changeset will give a more realistic diff that doesn't include merges.

Mads Kiilerich -


            r3323:a0729656

beta

Name	Size	Modified	Last Commit	Author
/ rhodecode / controllers / admin
__init__.py	Loading ...
admin.py	Loading ...
defaults.py	Loading ...
ldap_settings.py	Loading ...
notifications.py	Loading ...
permissions.py	Loading ...
repos.py	Loading ...
repos_groups.py	Loading ...
settings.py	Loading ...
users.py	Loading ...
users_groups.py	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages