Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
7860b95e
Commit
7860b95e
authored
Oct 14, 2011
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix fuckin merge
parent
48823f77
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
app/views/commits/index.html.haml
app/views/commits/index.html.haml
+0
-3
No files found.
app/views/commits/index.html.haml
View file @
7860b95e
...
@@ -9,10 +9,7 @@
...
@@ -9,10 +9,7 @@
=
select_tag
"tag"
,
options_for_select
(
@project
.
tags
,
@branch
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Tags"
=
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"
]
=
text_field_tag
"ssh"
,
@project
.
url_to_repo
,
:class
=>
[
"ssh_project_url"
,
"one_click_select"
]
.clear
.clear
<
<<<<<<
HEAD
-
if
params
[
:path
]
-
if
params
[
:path
]
%h3
{
:style
=>
"color:#555"
}
/
#{
params
[
:path
]
}
%h3
{
:style
=>
"color:#555"
}
/
#{
params
[
:path
]
}
==
=====
>
>>>>>> d3784687943e0bd699d73d82a6bc6cac39689473
%div
{
:id
=>
dom_id
(
@project
)}
%div
{
:id
=>
dom_id
(
@project
)}
=
render
"commits"
=
render
"commits"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment