Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
1cd693b9c3c6
Commit
1cd693b9
authored
Jan 05, 2013
by
Dmitriy Zaporozhets
Browse files
Fixed styles, ProjectHook specs etc
parent
6d20f21cc93a
Changes
22
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file @
1cd693b9
...
...
@@ -79,6 +79,5 @@
}
.title
{
padding
:
0
10px
;
@include
bg-gray-gradient
;
border-bottom
:
1px
solid
#CCC
;
...
...
@@ -83,6 +82,13 @@
@include
bg-gray-gradient
;
border-bottom
:
1px
solid
#CCC
;
color
:
#456
;
font-size
:
16px
;
text-shadow
:
0
1px
1px
#fff
;
padding
:
0px
10px
;
line-height
:
36px
;
font-size
:
14px
;
font-weight
:
normal
;
>
a
{
text-shadow
:
0
1px
1px
#fff
;
}
...
...
@@ -85,7 +91,32 @@
>
a
{
text-shadow
:
0
1px
1px
#fff
;
}
form
{
margin-bottom
:
0
;
margin-top
:
3px
;
}
.nav-pills
{
>
li
{
>
a
{
padding
:
13px
;
margin
:
0
;
font-size
:
13px
;
}
&
.active
{
>
a
{
background
:
#D5D5D5
;
color
:
$style_color
;
@include
border-radius
(
0
);
border-radius
:
0
;
border-left
:
1px
solid
#CCC
;
border-right
:
1px
solid
#CCC
;
}
}
}
}
}
&
.padded
{
...
...
app/assets/stylesheets/gitlab_bootstrap/lists.scss
View file @
1cd693b9
...
...
@@ -25,6 +25,10 @@
&
:last-child
{
border-bottom
:
none
;
&
.bottom
{
background
:
#f5f5f5
;
}
}
.author
{
color
:
#999
;
}
...
...
app/assets/stylesheets/gitlab_bootstrap/tables.scss
View file @
1cd693b9
...
...
@@ -25,7 +25,7 @@
}
th
,
td
{
padding
:
8
px
;
padding
:
10
px
;
line-height
:
18px
;
text-align
:
left
;
}
...
...
app/assets/stylesheets/sections/issues.scss
View file @
1cd693b9
...
...
@@ -61,13 +61,8 @@
#issues-table-holder
{
.issues_filters
{
form
{
padding
:
0
;
margin
:
0
;
margin-top
:
7px
}
}
.issues_bulk_update
{
margin
:
0
;
form
{
...
...
@@ -69,11 +64,9 @@
}
.issues_bulk_update
{
margin
:
0
;
form
{
padding
:
0
;
margin
:
0
;
margin-top
:
7px
float
:left
;
}
.update_selected_issues
{
position
:
relative
;
...
...
@@ -77,10 +70,10 @@
}
.update_selected_issues
{
position
:
relative
;
top
:
-2
px
;
top
:
5
px
;
margin-left
:
4px
;
float
:
left
;
}
.update_issues_text
{
padding
:
3px
;
...
...
@@ -81,8 +74,8 @@
margin-left
:
4px
;
float
:
left
;
}
.update_issues_text
{
padding
:
3px
;
line-height
:
1
8px
;
line-height
:
2
8px
;
float
:
left
;
...
...
@@ -88,4 +81,5 @@
float
:
left
;
color
:
#479
;
}
}
}
...
...
app/assets/stylesheets/sections/projects.scss
View file @
1cd693b9
...
...
@@ -8,8 +8,5 @@
.groups_box
,
.projects_box
{
>
h5
{
color
:
#456
;
font-size
:
16px
;
text-shadow
:
0
1px
1px
#fff
;
>
.title
{
padding
:
2px
15px
;
...
...
@@ -15,7 +12,4 @@
padding
:
2px
15px
;
line-height
:
36px
;
font-size
:
14px
;
font-weight
:
normal
;
}
.nav-projects-tabs
li
{
padding
:
0
;
}
.well-list
{
...
...
app/models/commit.rb
View file @
1cd693b9
...
...
@@ -98,6 +98,8 @@
end
def
initialize
(
raw_commit
,
head
=
nil
)
raise
"Nil as raw commit passed"
unless
raw_commit
@commit
=
raw_commit
@head
=
head
end
...
...
@@ -136,7 +138,11 @@
end
def
prev_commit
parents
.
try
:first
@prev_commit
||=
if
parents
.
present?
Commit
.
new
(
parents
.
first
)
else
nil
end
end
def
prev_commit_id
...
...
app/models/project.rb
View file @
1cd693b9
...
...
@@ -361,8 +361,8 @@
# Discover the default branch, but only if it hasn't already been set to
# something else
if
default_branch
.
nil?
update_attributes
(
default_branch:
discover_default_branch
)
if
repository
&&
default_branch
.
nil?
update_attributes
(
default_branch:
self
.
repository
.
discover_default_branch
)
end
end
...
...
app/views/admin/dashboard/index.html.haml
View file @
1cd693b9
.admin_dash.row
.span3
.ui-box
%h5
Projects
%h5
.title
Projects
.data.padded
=
link_to
admin_projects_path
do
%h1
=
Project
.
count
...
...
@@ -9,7 +9,7 @@
=
link_to
'New Project'
,
new_project_path
,
class:
"btn small"
.span3
.ui-box
%h5
Groups
%h5
.title
Groups
.data.padded
=
link_to
admin_groups_path
do
%h1
=
Group
.
count
...
...
@@ -17,7 +17,7 @@
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn small"
.span3
.ui-box
%h5
Users
%h5
.title
Users
.data.padded
=
link_to
admin_users_path
do
%h1
=
User
.
count
...
...
@@ -25,7 +25,7 @@
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn small"
.span3
.ui-box
%h5
%h5
.title
Resque Workers
.data.padded
-
if
@resque_accessible
...
...
app/views/admin/projects/show.html.haml
View file @
1cd693b9
...
...
@@ -4,7 +4,7 @@
%i
.icon-edit
Edit
-
if
@repository
.
has_commits?
-
if
@repository
&&
@repository
.
has_commits?
-
if
!
@repository
.
has_post_receive_file?
%br
.alert.alert-error
...
...
@@ -65,7 +65,10 @@
Created at:
%td
=
@project
.
created_at
.
stamp
(
"March 1, 1999"
)
%table
.zebra-striped
%thead
%tr
%td
%b
Smart HTTP:
%td
=
link_to
@project
.
http_url_to_repo
%tr
...
...
@@ -71,36 +74,34 @@
%tr
%th
Repository
%th
%tr
%td
%b
FS Path:
%td
%code
=
@repository
.
path_to_repo
%tr
%td
%b
Smart HTTP:
%td
=
link_to
@project
.
http_url_to_repo
%tr
%td
%b
SSH:
%td
=
link_to
@project
.
ssh_url_to_repo
%tr
%td
%b
Last commit at:
%td
=
last_commit
(
@project
)
%tr
%td
%b
Post Receive File:
%td
=
check_box_tag
:post_receive_file
,
1
,
@repository
.
has_post_receive_file?
,
disabled:
true
%td
%b
SSH:
%td
=
link_to
@project
.
ssh_url_to_repo
-
if
@repository
%table
.zebra-striped
%thead
%tr
%th
Repository
%th
%tr
%td
%b
FS Path:
%td
%code
=
@repository
.
path_to_repo
%tr
%td
%b
Last commit at:
%td
=
last_commit
(
@project
)
%tr
%td
%b
Post Receive File:
%td
=
check_box_tag
:post_receive_file
,
1
,
@repository
.
has_post_receive_file?
,
disabled:
true
%br
%h5
...
...
app/views/commits/_commits.html.haml
View file @
1cd693b9
-
@commits
.
group_by
{
|
c
|
c
.
committed_date
.
to_date
}.
each
do
|
day
,
commits
|
%div
.ui-box
%h
6
.title
%h
5
.title
%i
.icon-calendar
=
day
.
stamp
(
"28 Aug, 2010"
)
%ul
.well-list
=
render
commits
app/views/dashboard/issues.html.haml
View file @
1cd693b9
...
...
@@ -13,7 +13,8 @@
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
%div
.ui-box
-
@project
=
group
[
0
]
%h5
=
link_to_project
@project
%h5
.title
=
link_to_project
@project
%ul
.well-list.issues_table
-
group
[
1
].
each
do
|
issue
|
=
render
(
partial:
'issues/show'
,
locals:
{
issue:
issue
})
...
...
app/views/dashboard/merge_requests.html.haml
View file @
1cd693b9
...
...
@@ -12,7 +12,8 @@
-
@merge_requests
.
group_by
(
&
:project
).
each
do
|
group
|
.ui-box
-
@project
=
group
[
0
]
%h5
=
link_to_project
@project
%h5
.title
=
link_to_project
@project
%ul
.well-list
-
group
[
1
].
each
do
|
merge_request
|
=
render
(
partial:
'merge_requests/merge_request'
,
locals:
{
merge_request:
merge_request
})
...
...
app/views/groups/_projects.html.haml
View file @
1cd693b9
.projects_box
%h5
%h5
.title
Projects
%small
(
#{
projects
.
count
}
)
...
...
app/views/groups/issues.html.haml
View file @
1cd693b9
...
...
@@ -9,7 +9,8 @@
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
%div
.ui-box
-
@project
=
group
[
0
]
%h5
=
@project
.
name
%h5
.title
=
@project
.
name
%ul
.well-list.issues_table
-
group
[
1
].
each
do
|
issue
|
=
render
(
partial:
'issues/show'
,
locals:
{
issue:
issue
})
...
...
app/views/groups/merge_requests.html.haml
View file @
1cd693b9
...
...
@@ -8,7 +8,8 @@
-
@merge_requests
.
group_by
(
&
:project
).
each
do
|
group
|
%ul
.well-list.ui-box
-
@project
=
group
[
0
]
%h5
=
@project
.
name
%h5
.title
=
@project
.
name
-
group
[
1
].
each
do
|
merge_request
|
=
render
(
partial:
'merge_requests/merge_request'
,
locals:
{
merge_request:
merge_request
})
%hr
...
...
app/views/groups/people.html.haml
View file @
1cd693b9
...
...
@@ -5,7 +5,7 @@
-
if
can?
(
current_user
,
:manage_group
,
@group
)
=
render
(
@project
?
"new_member"
:
"new_group_member"
)
.ui-box
%h5
%h5
.title
Team
%small
(
#{
@users
.
size
}
)
...
...
app/views/issues/index.html.haml
View file @
1cd693b9
...
...
@@ -30,7 +30,7 @@
=
select_tag
(
'update[milestone_id]'
,
options_from_collection_for_select
(
issues_active_milestones
,
"id"
,
"title"
,
params
[
:milestone_id
]),
prompt:
"Milestone"
)
=
hidden_field_tag
'update[issues_ids]'
,
[]
=
hidden_field_tag
:f
,
params
[
:f
]
=
button_tag
"Save"
,
class:
"btn update_selected_issues"
=
button_tag
"Save"
,
class:
"btn update_selected_issues
btn-small save-btn
"
.issues_filters
.left
%ul
.nav.nav-pills.left
...
...
app/views/merge_requests/show/_commits.html.haml
View file @
1cd693b9
-
if
@commits
.
present?
.ui-box
%h
6
.title
%h
5
.title
%i
.icon-list
Commits (
#{
@commits
.
count
}
)
.merge-request-commits
...
...
app/views/team_members/_team.html.haml
View file @
1cd693b9
-
grouper_project_members
(
@project
).
each
do
|
access
,
members
|
.ui-box
%h5
%h5
.title
=
Project
.
access_options
.
key
(
access
).
pluralize
%small
=
members
.
size
%ul
.well-list
...
...
lib/static_model.rb
View file @
1cd693b9
...
...
@@ -38,7 +38,7 @@
end
def
==
(
other
)
if
other
.
is_a?
StaticModel
if
other
.
is_a?
::
StaticModel
id
==
other
.
id
else
super
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
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