diff options
author | Eric Davis <edavis@littlestreamsoftware.com> | 2009-08-15 22:41:40 +0000 |
---|---|---|
committer | Eric Davis <edavis@littlestreamsoftware.com> | 2009-08-15 22:41:40 +0000 |
commit | c28b044d6802559a9a2a07af1b7661a1122e5f48 (patch) | |
tree | 393dda01ed0fcd20ed98b2154f471a3a33440644 /app/views/repositories/show.rhtml | |
parent | a39bc8f1f4ec7c3b3ce2f27a02467cf497cef03a (diff) | |
download | redmine-c28b044d6802559a9a2a07af1b7661a1122e5f48.tar.gz redmine-c28b044d6802559a9a2a07af1b7661a1122e5f48.zip |
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
Diffstat (limited to 'app/views/repositories/show.rhtml')
-rw-r--r-- | app/views/repositories/show.rhtml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/app/views/repositories/show.rhtml b/app/views/repositories/show.rhtml index a0f7dc33c..aae6571f0 100644 --- a/app/views/repositories/show.rhtml +++ b/app/views/repositories/show.rhtml @@ -1,15 +1,10 @@ -<div class="contextual"> <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %> -<%= link_to l(:label_statistics), {:action => 'stats', :id => @project}, :class => 'icon icon-stats' %> -<% if !@entries.nil? && authorize_for('repositories', 'browse') -%> -<% form_tag({:action => 'browse', :id => @project}, :method => :get) do -%> -| <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %> -<% end -%> -<% end -%> +<div class="contextual"> + <%= render :partial => 'navigation' %> </div> -<h2><%= l(:label_repository) %> (<%= @repository.scm_name %>)</h2> +<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2> <% if !@entries.nil? && authorize_for('repositories', 'browse') %> <%= render :partial => 'dir_list' %> @@ -18,7 +13,7 @@ <% if !@changesets.empty? && authorize_for('repositories', 'revisions') %> <h3><%= l(:label_latest_revision_plural) %></h3> <%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%> -<p><%= link_to l(:label_view_revisions), :action => 'revisions', :id => @project %></p> +<p><%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project %></p> <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :action => 'revisions', :id => @project, :page => nil, :key => User.current.rss_key})) %> <% end %> |