Added branch and tag support to the git repository viewer. (#1406)
Many thanks to Adam Soltys and everyone else who tested this patch. * Updated git test repository so it has a branch with some differences from the master branch * Moved redmine diff class into a module so as not to clash with diff-lcs gem which is required by grit * Find changesets from all branches, not just master * Got revision browsing working * Got file actions working properly * Allow browsing by short form of commit identifier * Added a method to retrieve repository branches * Allow browsing by branch names as well as commit numbers * Handle the case where a git repository has no master branch * Expand revision box and handle finding revisions by first 8 characters * Added branches dropdown to repository show page * Combined repository browse and show into a single action. Moved branch/revision navigation into a partial. * Renamed partial navigation -> breadcrumbs * Made it so latest revisions list uses branch and path context * Preserve current path when changing branch or revision * Perform slightly more graceful error handling in the case of invalid repository URLs * Allow branch names to contain periods * Allow dashes in branch names * Sort branches by name * Adding tags dropdown * Need to disable both branches and tags dropdowns before submitting revision form * Support underscores in revision (branch/tag) names * Making file history sensitive to current branch/tag/revision, adding common navigation to changes page * Updated translation files to include labels for 'branch', 'tag', and 'view all revisions' * Reenable fields after submit so they don't look disabled and don't stay disabled on browser back button * Instead of dashes just use empty string for default dropdown value * Individual entry views now sport the upgraded revision navigation * Don't display dropdowns with no entries * Consider all revisions when doing initial load * Fixed bug grabbing changesets. Thanks to Bernhard Furtmueller for catching. * Always check the entire log to find new revisions, rather than trying to go forward from the latest known one * Added some cleverness to avoid selecting the whole changesets table any time someone views the repository root * File copies and renames being detected properly * Return gracefully if no revisions are found in the git log * Applied patch from Babar Le Lapin to improve Windows compatibility git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2840 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -798,3 +798,6 @@ bg:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -831,3 +831,6 @@ bs:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -801,3 +801,6 @@ ca:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -804,3 +804,6 @@ cs:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -831,3 +831,6 @@ da:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -830,3 +830,6 @@ de:
|
||||
mail_body_wiki_content_updated: "Die Wiki-Seite '{{page}}' wurde von {{author}} aktualisiert."
|
||||
permission_add_project: Erstelle Projekt
|
||||
setting_new_project_user_role_id: Rolle einem Nicht-Administrator zugeordnet, welcher ein Projekt erstellt
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -543,6 +543,8 @@ en:
|
||||
label_browse: Browse
|
||||
label_modification: "{{count}} change"
|
||||
label_modification_plural: "{{count}} changes"
|
||||
label_branch: Branch
|
||||
label_tag: Tag
|
||||
label_revision: Revision
|
||||
label_revision_plural: Revisions
|
||||
label_associated_revisions: Associated revisions
|
||||
@@ -554,6 +556,7 @@ en:
|
||||
label_latest_revision: Latest revision
|
||||
label_latest_revision_plural: Latest revisions
|
||||
label_view_revisions: View revisions
|
||||
label_view_all_revisions: View all revisions
|
||||
label_max_size: Maximum size
|
||||
label_sort_highest: Move to top
|
||||
label_sort_higher: Move up
|
||||
|
||||
@@ -851,3 +851,6 @@ es:
|
||||
mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}.
|
||||
permission_add_project: Crear proyecto
|
||||
setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -841,3 +841,6 @@ fi:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -832,4 +832,7 @@ fr:
|
||||
enumeration_doc_categories: Catégories des documents
|
||||
enumeration_activities: Activités (suivi du temps)
|
||||
label_greater_or_equal: ">="
|
||||
label_less_or_equal: <=
|
||||
label_less_or_equal: "<="
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -830,3 +830,6 @@ gl:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -813,3 +813,6 @@ he:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -836,3 +836,6 @@
|
||||
mail_body_wiki_content_updated: A '{{page}}' wiki oldalt {{author}} frissítette.
|
||||
permission_add_project: Projekt létrehozása
|
||||
setting_new_project_user_role_id: Projekt létrehozási jog nem adminisztrátor felhasználóknak
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -816,3 +816,6 @@ it:
|
||||
mail_body_wiki_content_updated: La pagina '{{page}}' wiki è stata aggiornata da{{author}}.
|
||||
permission_add_project: Crea progetto
|
||||
setting_new_project_user_role_id: Ruolo assegnato agli utenti non amministratori che creano un progetto
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -838,3 +838,6 @@ ja:
|
||||
enumeration_issue_priorities: チケットの優先度
|
||||
enumeration_doc_categories: 文書カテゴリ
|
||||
enumeration_activities: 作業分類 (時間トラッキング)
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -869,3 +869,6 @@ ko:
|
||||
# by Kihyun Yoon(ddumbugie@gmail.com)
|
||||
# by John Hwang (jhwang@tavon.org),http://github.com/tavon
|
||||
field_issue_to: Related issue
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -841,3 +841,6 @@ lt:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -786,3 +786,6 @@ nl:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -803,3 +803,6 @@
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -834,3 +834,6 @@ pl:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -836,3 +836,6 @@ pt-BR:
|
||||
mail_body_wiki_content_updated: A página wiki '{{page}}' foi atualizada por {{author}}.
|
||||
permission_add_project: Criar projeto
|
||||
setting_new_project_user_role_id: Papel dado a um usuário não administrador que crie um projeto
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -822,3 +822,6 @@ pt:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -801,3 +801,6 @@ ro:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -928,3 +928,6 @@ ru:
|
||||
mail_body_wiki_content_updated: "{{author}} обновил(а) wiki-страницу '{{page}}'."
|
||||
permission_add_project: Создание проекта
|
||||
setting_new_project_user_role_id: Роль, назначаемая пользователю, создавшему проект
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -802,4 +802,7 @@ sk:
|
||||
label_wiki_content_updated: Wiki stránka aktualizovaná
|
||||
mail_body_wiki_content_updated: Wiki stránka '{{page}}' bola aktualizovaná užívateľom {{author}}.
|
||||
setting_repositories_encodings: Kódovanie repozitára
|
||||
setting_new_project_user_role_id: Rola dána non-admin užívateľovi, ktorý vytvorí projekt
|
||||
setting_new_project_user_role_id: Rola dána non-admin užívateľovi, ktorý vytvorí projekt
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -800,3 +800,6 @@ sl:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -824,3 +824,6 @@
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -858,3 +858,6 @@ sv:
|
||||
enumeration_issue_priorities: Ärendeprioriteter
|
||||
enumeration_doc_categories: Dokumentkategorier
|
||||
enumeration_activities: Aktiviteter (tidsuppföljning)
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -801,3 +801,6 @@ th:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -837,3 +837,6 @@ tr:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -800,3 +800,6 @@ uk:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -870,3 +870,6 @@ vi:
|
||||
mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
|
||||
permission_add_project: Create project
|
||||
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -908,3 +908,6 @@
|
||||
enumeration_issue_priorities: 項目優先權
|
||||
enumeration_doc_categories: 文件分類
|
||||
enumeration_activities: 活動 (時間追蹤)
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
@@ -833,3 +833,6 @@ zh:
|
||||
enumeration_issue_priorities: 问题优先级
|
||||
enumeration_doc_categories: 文档类别
|
||||
enumeration_activities: 活动(时间跟踪)
|
||||
label_view_all_revisions: View all revisions
|
||||
label_tag: Tag
|
||||
label_branch: Branch
|
||||
|
||||
+1
-1
@@ -218,7 +218,7 @@ ActionController::Routing::Routes.draw do |map|
|
||||
repository_views.connect 'projects/:id/repository/revisions/:rev', :action => 'revision'
|
||||
repository_views.connect 'projects/:id/repository/revisions/:rev/diff', :action => 'diff'
|
||||
repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format', :action => 'diff'
|
||||
repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path'
|
||||
repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
|
||||
repository_views.connect 'projects/:id/repository/:action/*path'
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user