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

Dmitriy Zaporozhets
2 parents fc058605 3c3d26f3
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
README.md
app/views/repositories/_branch.html.haml
@@ -12,7 +12,7 @@ GitLab is a free project and repository management application
 ## Requirements
  
 * ruby 1.9.2
-* sqlite
+* mysql
 * git
 * gitolite
 * redis
@@ -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
...	...	@@ -12,7 +12,7 @@ GitLab is a free project and repository management application
12	12	## Requirements
13	13
14	14	* ruby 1.9.2
15		-* sqlite
	15	+* mysql
16	16	* git
17	17	* gitolite
18	18	* redis
...	...
...	...	@@ -5,7 +5,7 @@
5	5	- if branch.name == @project.root_ref
6	6	%span.label default
7	7	%td
8		- = link_to project_commit_path(@project, branch.commit.id) do
	8	+ = link_to project_commit_path(@project, :id => branch.commit.id) do
9	9	%code= branch.commit.id.to_s[0..10]
10	10
11	11	= image_tag gravatar_icon(Commit.new(branch.commit).author_email), :class => "", :width => 16
...	...