Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
14649525
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,体验更适合开发者的 AI 搜索 >>
提交
14649525
编写于
7月 19, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix comments in MR. Fixed event destroy with user
上级
214fdd2d
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
24 addition
and
15 deletion
+24
-15
app/assets/javascripts/note.js
app/assets/javascripts/note.js
+2
-2
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+2
-1
app/assets/stylesheets/header.scss
app/assets/stylesheets/header.scss
+7
-4
app/controllers/admin/projects_controller.rb
app/controllers/admin/projects_controller.rb
+1
-1
app/models/user.rb
app/models/user.rb
+5
-0
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+3
-3
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+2
-2
app/views/notes/_form.html.haml
app/views/notes/_form.html.haml
+1
-1
app/views/notes/_per_line_form.html.haml
app/views/notes/_per_line_form.html.haml
+1
-1
未找到文件。
app/assets/javascripts/note.js
浏览文件 @
14649525
...
...
@@ -25,11 +25,11 @@ init:
$
(
this
).
closest
(
'
li
'
).
fadeOut
();
});
$
(
"
#new_note
"
).
live
(
"
ajax:before
"
,
function
(){
$
(
"
#
submit_note
"
).
attr
(
"
disabled
"
,
"
disabled
"
);
$
(
"
.
submit_note
"
).
attr
(
"
disabled
"
,
"
disabled
"
);
})
$
(
"
#new_note
"
).
live
(
"
ajax:complete
"
,
function
(){
$
(
"
#
submit_note
"
).
removeAttr
(
"
disabled
"
);
$
(
"
.
submit_note
"
).
removeAttr
(
"
disabled
"
);
})
$
(
"
#note_note
"
).
live
(
"
focus
"
,
function
(){
...
...
app/assets/stylesheets/gitlab_bootstrap.scss
浏览文件 @
14649525
...
...
@@ -213,6 +213,7 @@ a:focus {
.cblack
{
color
:
#111
;
}
.cdark
{
color
:
#444
}
.cwhite
{
color
:
#fff
!
important
}
.bgred
{
background
:
#F2DEDE
!
important
}
/** COMMON STYLES **/
.left
{
...
...
@@ -650,7 +651,7 @@ p {
h3
.page_title
{
color
:
#456
;
font-size
:
20px
;
font-weight
:
600
;
font-weight
:
normal
;
line-height
:
28px
;
}
...
...
app/assets/stylesheets/header.scss
浏览文件 @
14649525
...
...
@@ -96,7 +96,7 @@ header {
*/
.search
{
float
:
right
;
margin-right
:
5
5
px
;
margin-right
:
5
0
px
;
.search-input
{
@extend
.span2
;
...
...
@@ -125,11 +125,14 @@ header {
display
:
block
;
cursor
:
pointer
;
img
{
-moz-box-shadow
:
0
0
5px
#ccc
;
-webkit-box-shadow
:
0
0
5px
#ccc
;
box-shadow
:
0
0
5px
#ccc
;
border-radius
:
4px
;
right
:
0
px
;
right
:
5
px
;
position
:
absolute
;
width
:
3
3
px
;
height
:
3
3
px
;
width
:
3
1
px
;
height
:
3
1
px
;
display
:
block
;
top
:
0
;
&
:after
{
...
...
app/controllers/admin/projects_controller.rb
浏览文件 @
14649525
...
...
@@ -6,7 +6,7 @@ class Admin::ProjectsController < ApplicationController
def
index
@admin_projects
=
Project
.
scoped
@admin_projects
=
@admin_projects
.
search
(
params
[
:name
])
if
params
[
:name
].
present?
@admin_projects
=
@admin_projects
.
page
(
params
[
:page
])
@admin_projects
=
@admin_projects
.
page
(
params
[
:page
])
.
per
(
20
)
end
def
show
...
...
app/models/user.rb
浏览文件 @
14649525
...
...
@@ -15,6 +15,11 @@ class User < ActiveRecord::Base
has_many
:my_own_projects
,
:class_name
=>
"Project"
,
:foreign_key
=>
:owner_id
has_many
:keys
,
:dependent
=>
:destroy
has_many
:events
,
:class_name
=>
"Event"
,
:foreign_key
=>
:author_id
,
:dependent
=>
:destroy
has_many
:recent_events
,
:class_name
=>
"Event"
,
:foreign_key
=>
:author_id
,
...
...
app/views/admin/projects/index.html.haml
浏览文件 @
14649525
...
...
@@ -13,8 +13,8 @@
%th
Team Members
%th
Post Receive
%th
Last Commit
%th
%th
%th
Edit
%th
.cred
Danger Zone!
-
@admin_projects
.
each
do
|
project
|
%tr
...
...
@@ -24,5 +24,5 @@
%td
=
check_box_tag
:post_receive_file
,
1
,
project
.
has_post_receive_file?
,
:disabled
=>
true
%td
=
last_commit
(
project
)
%td
=
link_to
'Edit'
,
edit_admin_project_path
(
project
),
:id
=>
"edit_
#{
dom_id
(
project
)
}
"
,
:class
=>
"btn small"
%td
=
link_to
'Destroy'
,
[
:admin
,
project
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn small danger"
%td
.bgred
=
link_to
'Destroy'
,
[
:admin
,
project
],
:confirm
=>
"REMOVE
#{
project
.
name
}
? Are you sure?"
,
:method
=>
:delete
,
:class
=>
"btn small danger"
=
paginate
@admin_projects
,
:theme
=>
"admin"
app/views/admin/users/index.html.haml
浏览文件 @
14649525
...
...
@@ -27,7 +27,7 @@
%th
Projects
%th
Edit
%th
Blocked
%th
%th
.cred
Danger Zone!
-
@admin_users
.
each
do
|
user
|
%tr
...
...
@@ -41,6 +41,6 @@
=
link_to
'Unblock'
,
unblock_admin_user_path
(
user
),
:method
=>
:put
,
:class
=>
"btn small success"
-
else
=
link_to
'Block'
,
block_admin_user_path
(
user
),
:confirm
=>
'USER WILL BE BLOCKED! Are you sure?'
,
:method
=>
:put
,
:class
=>
"btn small danger"
%td
=
link_to
'Destroy'
,
[
:admin
,
user
],
:confirm
=>
'USER WILL BE REMOVED! Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn small danger"
%td
.bgred
=
link_to
'Destroy'
,
[
:admin
,
user
],
:confirm
=>
"USER
#{
user
.
name
}
WILL BE REMOVED! Are you sure?"
,
:method
=>
:delete
,
:class
=>
"btn small danger"
=
paginate
@admin_users
,
:theme
=>
"admin"
app/views/notes/_form.html.haml
浏览文件 @
14649525
...
...
@@ -32,4 +32,4 @@
%span
Any file less than 10 MB
=
f
.
submit
'Add Comment'
,
:class
=>
"btn primary"
,
:id
=>
"submit_note"
=
f
.
submit
'Add Comment'
,
:class
=>
"btn primary
submit_note
"
,
:id
=>
"submit_note"
app/views/notes/_per_line_form.html.haml
浏览文件 @
14649525
...
...
@@ -24,7 +24,7 @@
=
check_box_tag
:notify_author
,
1
,
@note
.
noteable_type
==
"Commit"
%span
Commit author
.actions
=
f
.
submit
'Add note'
,
:class
=>
"btn primary"
,
:id
=>
"submit_note"
=
f
.
submit
'Add note'
,
:class
=>
"btn primary
submit_note
"
,
:id
=>
"submit_note"
=
link_to
"Close"
,
"#"
,
:class
=>
"btn hide-button"
:javascript
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录