Merge remote-tracking branch 'origin/master' into issue-4-gitlab_url

Conflicts:
	Makefile

Makefile

@@ -20,7 +20,7 @@ gitlab/config/database.yml:
 	sed "s|/home/git|${gitlab_development_root}|" database.yml.example > gitlab/config/database.yml
 gitlab/config/unicorn.rb:
-	sed "s|/home/git|${gitlab_development_root}|" gitlab/config/unicorn.rb.example > gitlab/config/unicorn.rb
+	cp gitlab/config/unicorn.rb{.example.development,}
 gitlab/config/resque.yml:
 	sed "s|/home/git|${gitlab_development_root}|" redis/resque.yml.example > $@
@@ -36,7 +36,7 @@ gitlab-shell/.git:
 	git clone ${gitlab_shell_repo} gitlab-shell
 gitlab-shell/config.yml:
-	sed "s|/home/git|${gitlab_development_root}|;s|:8080/|:3000|" gitlab-shell/config.yml.example > gitlab-shell/config.yml
+	sed "s|/home/git|${gitlab_development_root}|;s|:8080/|:3000|;s|/usr/bin/redis-cli|$(shell which redis-cli)|" gitlab-shell/config.yml.example > gitlab-shell/config.yml
 gitlab-shell/.bundle:
 	cd ${gitlab_development_root}/gitlab-shell && bundle install --without production --jobs 4