diff options
| author | Bryan Newbold <bnewbold@charm.mit.edu> | 2008-05-31 21:02:45 -0400 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@charm.mit.edu> | 2008-05-31 21:02:45 -0400 |
| commit | 9518f03800ca6becf011e0c3ebe31ee6ed70d8e3 (patch) | |
| tree | cda95acd32ca5ed993e069bc142693f4497c0b5c | |
| parent | 9767cd06c0e062a0c4d68a8b40b91aa98a556dfa (diff) | |
| parent | fd8fc52ffa580c7bd612adb895daf293b1bed5ef (diff) | |
| download | bnewnet-9518f03800ca6becf011e0c3ebe31ee6ed70d8e3.tar.gz bnewnet-9518f03800ca6becf011e0c3ebe31ee6ed70d8e3.zip | |
Merge branch 'master' of ssh://animus.robocracy.org/srv/git/bn-project
| -rw-r--r-- | bn_django/git_browse/templates/git_browse/repository_info.html | 2 | ||||
| -rw-r--r-- | bn_django/git_browse/urls.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bn_django/git_browse/templates/git_browse/repository_info.html b/bn_django/git_browse/templates/git_browse/repository_info.html index 9be33ee..f529c84 100644 --- a/bn_django/git_browse/templates/git_browse/repository_info.html +++ b/bn_django/git_browse/templates/git_browse/repository_info.html @@ -2,7 +2,7 @@ {% block gitbrowse %} {{ object.description }} -<h3>Shortlog (<a href="/code/{{object.slug}}/log/">full log</a>) (<a href="/code/{{object.slug}}/commit/">last commit</a>)</h3> +<h3>Shortlog (<a href="/code/{{object.slug}}/log/">full log</a>) (<a href="#"><strike>last commit</strike></a>)</h3> {% include "git_browse/shortlog_table" %} <h3>Heads (<a href="/code/{{object.slug}}/tree/">browse</a>)</h3> {% include "git_browse/heads_table" %} diff --git a/bn_django/git_browse/urls.py b/bn_django/git_browse/urls.py index 141f533..b608027 100644 --- a/bn_django/git_browse/urls.py +++ b/bn_django/git_browse/urls.py @@ -34,7 +34,7 @@ urlpatterns += patterns('bn_django.git_browse.views', (r'^(?P<repo>[\w\-\_]*)/log/$', 'view_log',), (r'^(?P<repo>[\w\-\_]*)/obj/(?P<hash>[0-9a-z]{40})/$', 'view_obj',), (r'^(?P<repo>[\w\-\_]*)/commit/(?P<hash>[0-9a-z]{40})/$', 'view_commit',), - (r'^(?P<repo>[\w\-\_]*)/commit/$', 'view_commit',), + #(r'^(?P<repo>[\w\-\_]*)/commit/$', 'view_commit',), (r'^(?P<repo>[\w\-\_]*)/commit/(?P<hash>[0-9a-z]{40})/zip/$', 'zip',), #TODO: head and tag views (r'^(?P<repo>[\w\-\_]*)/tag/(?P<hash>[\w\-\_]+)/$', 'view_commit',), |