Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2011-10-14 17:40:41 +0400
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2011-10-14 17:40:41 +0400
commitf913b5663fc79d4866b15a09db3ac503a9cde50f (patch)
tree46e528914f477681d7e7a9818f0b364066a1b79f /app
parent9a198054822eb60774bfcfc945a9f0d2ad7dd720 (diff)
parentd3784687943e0bd699d73d82a6bc6cac39689473 (diff)
install & update
Diffstat (limited to 'app')
-rw-r--r--app/views/commits/index.html.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/commits/index.html.haml b/app/views/commits/index.html.haml
index 0e231e4ec2a..ea08be4bf83 100644
--- a/app/views/commits/index.html.haml
+++ b/app/views/commits/index.html.haml
@@ -9,7 +9,10 @@
= select_tag "tag", options_for_select(@project.tags, @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
= text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url", "one_click_select"]
.clear
+<<<<<<< HEAD
- if params[:path]
%h3{:style => "color:#555"} /#{params[:path]}
+=======
+>>>>>>> d3784687943e0bd699d73d82a6bc6cac39689473
%div{:id => dom_id(@project)}
= render "commits"