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
1c9351ab
Commit
1c9351ab
authored
Oct 26, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restyle branches list. Remove unneccesary styles from tree avatar
parent
b4708d00
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
12 deletions
+17
-12
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+1
-4
app/views/repositories/_branch.html.haml
app/views/repositories/_branch.html.haml
+13
-7
app/views/repositories/_branches_head.html.haml
app/views/repositories/_branches_head.html.haml
+3
-1
No files found.
app/assets/stylesheets/sections/tree.scss
View file @
1c9351ab
...
...
@@ -57,10 +57,7 @@
padding-right
:
8px
;
img
.avatar
{
border
:
0
none
;
float
:
none
;
margin-right
:
0
;
padding
:
0
;
margin-top
:
0
;
width
:
16px
;
}
}
...
...
app/views/repositories/_branch.html.haml
View file @
1c9351ab
...
...
@@ -3,19 +3,25 @@
%tr
%td
=
link_to
project_commits_path
(
@project
,
branch
.
name
)
do
-
if
@project
.
protected_branch?
branch
.
name
%i
.icon-lock
-
else
%i
.icon-unlock
%strong
=
truncate
(
branch
.
name
,
length:
60
)
-
if
branch
.
name
==
@project
.
root_ref
%span
.label
default
%td
=
link_to
project_commit_path
(
@project
,
commit
)
do
%code
=
commit
.
short_id
=
image_tag
gravatar_icon
(
commit
.
author_email
),
class:
""
,
width:
16
=
gfm
escape_once
(
truncate
(
commit
.
title
,
length:
40
))
%span
.update-author.right
=
link_to
project_commit_path
(
@project
,
commit
.
id
),
class:
'commit_short_id'
do
=
commit
.
short_id
=
image_tag
gravatar_icon
(
commit
.
author_email
),
class:
"avatar s16"
%span
.light
=
gfm
escape_once
(
truncate
(
commit
.
title
,
length:
40
))
%span
=
time_ago_in_words
(
commit
.
committed_date
)
ago
%td
-
if
can?
current_user
,
:download_code
,
@project
=
link_to
"Download"
,
archive_project_repository_path
(
@project
,
ref:
branch
.
name
),
class:
"visible_link download_repo_link"
=
link_to
archive_project_repository_path
(
@project
,
ref:
branch
.
name
)
do
%i
.icon-download
Download
app/views/repositories/_branches_head.html.haml
View file @
1c9351ab
...
...
@@ -3,6 +3,8 @@
=
nav_link
(
path:
'repositories#show'
)
do
=
link_to
'Recent'
,
project_repository_path
(
@project
)
=
nav_link
(
path:
'protected_branches#index'
)
do
=
link_to
'Protected'
,
project_protected_branches_path
(
@project
)
=
link_to
project_protected_branches_path
(
@project
)
do
%i
.icon-lock
Protected
=
nav_link
(
path:
'repositories#branches'
)
do
=
link_to
'All'
,
branches_project_repository_path
(
@project
)
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