Merge branch 'master' of github.com:gitlabhq/gitlabhq

2012-03-09 20:05:07 +02:00 · 2012-03-09 20:05:07 +02:00 · 51f7d94991
commit 51f7d94991
parent fc058605c2 3c3d26f3e7
2 changed files with 2 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -12,7 +12,7 @@ GitLab is a free project and repository management application
 ## Requirements

 * ruby 1.9.2
-* sqlite
+* mysql
 * git
 * gitolite
 * redis
--- a/app/views/repositories/_branch.html.haml
+++ b/app/views/repositories/_branch.html.haml
@ -5,7 +5,7 @@
      - if branch.name == @project.root_ref
        %span.label default
  %td
-    = link_to project_commit_path(@project, branch.commit.id) do
+    = link_to project_commit_path(@project, :id => branch.commit.id) do
      %code= branch.commit.id.to_s[0..10]

    = image_tag gravatar_icon(Commit.new(branch.commit).author_email), :class => "", :width => 16