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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f197fa1f
Commit
f197fa1f
authored
Aug 08, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix github issue #1153
parent
a8ce107c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
5 deletions
+2
-5
app/views/protected_branches/index.html.haml
app/views/protected_branches/index.html.haml
+1
-1
app/views/repositories/_branch.html.haml
app/views/repositories/_branch.html.haml
+1
-2
app/views/repositories/branches.html.haml
app/views/repositories/branches.html.haml
+0
-1
app/views/repositories/show.html.haml
app/views/repositories/show.html.haml
+0
-1
No files found.
app/views/protected_branches/index.html.haml
View file @
f197fa1f
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
-
if
branch
.
name
==
@project
.
root_ref
-
if
branch
.
name
==
@project
.
root_ref
%span
.label
default
%span
.label
default
%td
%td
=
link_to
project_commit
s
_path
(
@project
,
branch
.
commit
.
id
)
do
=
link_to
project_commit_path
(
@project
,
branch
.
commit
.
id
)
do
=
truncate
branch
.
commit
.
id
.
to_s
,
:length
=>
10
=
truncate
branch
.
commit
.
id
.
to_s
,
:length
=>
10
=
time_ago_in_words
(
branch
.
commit
.
committed_date
)
=
time_ago_in_words
(
branch
.
commit
.
committed_date
)
ago
ago
...
...
app/views/repositories/_branch.html.haml
View file @
f197fa1f
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
%tr
%tr
%td
%td
=
link_to
project_commits_path
(
@project
,
:ref
=>
branch
.
name
)
do
=
link_to
project_commits_path
(
@project
,
:ref
=>
branch
.
name
)
do
%strong
=
branch
.
name
%strong
=
truncate
(
branch
.
name
,
:length
=>
60
)
-
if
branch
.
name
==
@project
.
root_ref
-
if
branch
.
name
==
@project
.
root_ref
%span
.label
default
%span
.label
default
%td
%td
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
""
,
:width
=>
16
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
""
,
:width
=>
16
=
gfm
truncate
(
commit
.
title
,
:length
=>
40
)
=
gfm
truncate
(
commit
.
title
,
:length
=>
40
)
%td
%span
.update-author.right
%span
.update-author.right
=
time_ago_in_words
(
commit
.
committed_date
)
=
time_ago_in_words
(
commit
.
committed_date
)
ago
ago
...
...
app/views/repositories/branches.html.haml
View file @
f197fa1f
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
%tr
%tr
%th
Name
%th
Name
%th
Last commit
%th
Last commit
%th
Updated at
%th
%th
%tbody
%tbody
...
...
app/views/repositories/show.html.haml
View file @
f197fa1f
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
%tr
%tr
%th
Name
%th
Name
%th
Last commit
%th
Last commit
%th
Updated at
%th
%th
-
@activities
.
each
do
|
update
|
-
@activities
.
each
do
|
update
|
=
render
"repositories/branch"
,
:branch
=>
update
.
head
=
render
"repositories/branch"
,
:branch
=>
update
.
head
...
...
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