Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e16cebac
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e16cebac
编写于
1月 05, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed styles, ProjectHook specs etc
上级
c6298678
变更
22
隐藏空白更改
内联
并排
Showing
22 changed file
with
110 addition
and
75 deletion
+110
-75
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+32
-1
app/assets/stylesheets/gitlab_bootstrap/lists.scss
app/assets/stylesheets/gitlab_bootstrap/lists.scss
+4
-0
app/assets/stylesheets/gitlab_bootstrap/tables.scss
app/assets/stylesheets/gitlab_bootstrap/tables.scss
+1
-1
app/assets/stylesheets/sections/issues.scss
app/assets/stylesheets/sections/issues.scss
+4
-10
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+1
-7
app/models/commit.rb
app/models/commit.rb
+7
-1
app/models/project.rb
app/models/project.rb
+2
-2
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+4
-4
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+36
-35
app/views/commits/_commits.html.haml
app/views/commits/_commits.html.haml
+1
-1
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+2
-1
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+2
-1
app/views/groups/_projects.html.haml
app/views/groups/_projects.html.haml
+1
-1
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+2
-1
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+2
-1
app/views/groups/people.html.haml
app/views/groups/people.html.haml
+1
-1
app/views/issues/index.html.haml
app/views/issues/index.html.haml
+1
-1
app/views/merge_requests/show/_commits.html.haml
app/views/merge_requests/show/_commits.html.haml
+1
-1
app/views/team_members/_team.html.haml
app/views/team_members/_team.html.haml
+1
-1
lib/static_model.rb
lib/static_model.rb
+1
-1
spec/lib/extracts_path_spec.rb
spec/lib/extracts_path_spec.rb
+1
-1
spec/models/project_hooks_spec.rb
spec/models/project_hooks_spec.rb
+3
-2
未找到文件。
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
浏览文件 @
e16cebac
...
...
@@ -79,13 +79,44 @@
}
.title
{
padding
:
0
10px
;
@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
;
}
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
浏览文件 @
e16cebac
...
...
@@ -25,6 +25,10 @@
&
:last-child
{
border-bottom
:
none
;
&
.bottom
{
background
:
#f5f5f5
;
}
}
.author
{
color
:
#999
;
}
...
...
app/assets/stylesheets/gitlab_bootstrap/tables.scss
浏览文件 @
e16cebac
...
...
@@ -25,7 +25,7 @@ table {
}
th
,
td
{
padding
:
8
px
;
padding
:
10
px
;
line-height
:
18px
;
text-align
:
left
;
}
...
...
app/assets/stylesheets/sections/issues.scss
浏览文件 @
e16cebac
...
...
@@ -61,31 +61,25 @@ input.check_all_issues {
#issues-table-holder
{
.issues_filters
{
form
{
padding
:
0
;
margin
:
0
;
margin-top
:
7px
}
}
.issues_bulk_update
{
margin
:
0
;
form
{
padding
:
0
;
margin
:
0
;
margin-top
:
7px
float
:left
;
}
.update_selected_issues
{
position
:
relative
;
top
:
-2
px
;
top
:
5
px
;
margin-left
:
4px
;
float
:
left
;
}
.update_issues_text
{
padding
:
3px
;
line-height
:
1
8px
;
line-height
:
2
8px
;
float
:
left
;
color
:
#479
;
}
}
}
...
...
app/assets/stylesheets/sections/projects.scss
浏览文件 @
e16cebac
...
...
@@ -8,14 +8,8 @@
.groups_box
,
.projects_box
{
>
h5
{
color
:
#456
;
font-size
:
16px
;
text-shadow
:
0
1px
1px
#fff
;
>
.title
{
padding
:
2px
15px
;
line-height
:
36px
;
font-size
:
14px
;
font-weight
:
normal
;
}
.nav-projects-tabs
li
{
padding
:
0
;
}
.well-list
{
...
...
app/models/commit.rb
浏览文件 @
e16cebac
...
...
@@ -98,6 +98,8 @@ class Commit
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 @@ class Commit
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
浏览文件 @
e16cebac
...
...
@@ -361,8 +361,8 @@ class Project < ActiveRecord::Base
# 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
浏览文件 @
e16cebac
.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
浏览文件 @
e16cebac
...
...
@@ -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,42 +65,43 @@
Created at:
%td
=
@project
.
created_at
.
stamp
(
"March 1, 1999"
)
%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
%table
.zebra-striped
%thead
-
if
@repository
%table
.zebra-striped
%thead
%tr
%th
Repository
%th
%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
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
浏览文件 @
e16cebac
-
@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
浏览文件 @
e16cebac
...
...
@@ -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
浏览文件 @
e16cebac
...
...
@@ -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
浏览文件 @
e16cebac
.projects_box
%h5
%h5
.title
Projects
%small
(
#{
projects
.
count
}
)
...
...
app/views/groups/issues.html.haml
浏览文件 @
e16cebac
...
...
@@ -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
浏览文件 @
e16cebac
...
...
@@ -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
浏览文件 @
e16cebac
...
...
@@ -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
浏览文件 @
e16cebac
...
...
@@ -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
浏览文件 @
e16cebac
-
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
浏览文件 @
e16cebac
-
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
浏览文件 @
e16cebac
...
...
@@ -38,7 +38,7 @@ module StaticModel
end
def
==
(
other
)
if
other
.
is_a?
StaticModel
if
other
.
is_a?
::
StaticModel
id
==
other
.
id
else
super
...
...
spec/lib/extracts_path_spec.rb
浏览文件 @
e16cebac
...
...
@@ -7,7 +7,7 @@ describe ExtractsPath do
before
do
@project
=
project
project
.
stub
(
:ref_names
).
and_return
([
'master'
,
'foo/bar/baz'
,
'v1.0.0'
,
'v2.0.0'
]
)
project
.
stub
(
repository:
stub
(
ref_names:
[
'master'
,
'foo/bar/baz'
,
'v1.0.0'
,
'v2.0.0'
])
)
project
.
stub
(
path_with_namespace:
'gitlab/gitlab-ci'
)
end
...
...
spec/models/project_hooks_spec.rb
浏览文件 @
e16cebac
...
...
@@ -71,8 +71,9 @@ describe Project, "Hooks" do
context
"when gathering commit data"
do
before
do
@oldrev
,
@newrev
,
@ref
=
project
.
fresh_commits
(
2
).
last
.
sha
,
project
.
fresh_commits
(
2
).
first
.
sha
,
'refs/heads/master'
@commit
=
project
.
fresh_commits
(
2
).
first
@oldrev
,
@newrev
,
@ref
=
project
.
repository
.
fresh_commits
(
2
).
last
.
sha
,
project
.
repository
.
fresh_commits
(
2
).
first
.
sha
,
'refs/heads/master'
@commit
=
project
.
repository
.
fresh_commits
(
2
).
first
# Fill nil/empty attributes
project
.
description
=
"This is a description"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录