Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
94f8b51c
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,发现更多精彩内容 >>
提交
94f8b51c
编写于
11月 05, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhq
上级
b813a488
d78b6ce4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
3 deletion
+29
-3
app/controllers/projects/team_members_controller.rb
app/controllers/projects/team_members_controller.rb
+10
-1
app/models/project.rb
app/models/project.rb
+5
-1
app/models/user.rb
app/models/user.rb
+5
-0
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+8
-1
config/routes.rb
config/routes.rb
+1
-0
未找到文件。
app/controllers/projects/team_members_controller.rb
浏览文件 @
94f8b51c
class
Projects::TeamMembersController
<
Projects
::
ApplicationController
# Authorize
before_filter
:authorize_admin_project!
before_filter
:authorize_admin_project!
,
except: :leave
layout
"project_settings"
...
...
@@ -45,6 +45,15 @@ class Projects::TeamMembersController < Projects::ApplicationController
end
end
def
leave
project
.
users_projects
.
find_by_user_id
(
current_user
).
destroy
respond_to
do
|
format
|
format
.
html
{
redirect_to
:back
}
format
.
js
{
render
nothing:
true
}
end
end
def
apply_import
giver
=
Project
.
find
(
params
[
:source_project_id
])
status
=
@project
.
team
.
import
(
giver
)
...
...
app/models/project.rb
浏览文件 @
94f8b51c
...
...
@@ -317,7 +317,7 @@ class Project < ActiveRecord::Base
mrs
=
self
.
merge_requests
.
opened
.
by_branch
(
branch_name
).
all
# Update code for merge requests between project and project fork
mrs
+=
self
.
fork_merge_requests
.
opened
.
by_branch
(
branch_name
).
all
mrs
.
each
{
|
merge_request
|
merge_request
.
reload_code
;
merge_request
.
mark_as_unchecked
}
# Close merge requests
...
...
@@ -447,4 +447,8 @@ class Project < ActiveRecord::Base
order
(
'id DESC'
).
limit
(
100
).
update_all
(
updated_at:
Time
.
now
)
end
def
project_member
(
user
)
users_projects
.
where
(
user_id:
user
).
first
end
end
app/models/user.rb
浏览文件 @
94f8b51c
...
...
@@ -395,4 +395,9 @@ class User < ActiveRecord::Base
self
end
def
can_leave_project?
(
project
)
project
.
namespace
!=
namespace
&&
project
.
project_member
(
self
)
end
end
app/views/dashboard/projects.html.haml
浏览文件 @
94f8b51c
...
...
@@ -54,7 +54,7 @@
.span9
%ul
.bordered-list.my-projects.top-list
-
@projects
.
each
do
|
project
|
%li
%li
.my-project-row
%h4
.project-title
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
=
project
.
name_with_namespace
...
...
@@ -63,6 +63,12 @@
=
public_icon
Public
-
if
current_user
.
can_leave_project?
(
project
)
.pull-right
=
link_to
leave_project_team_members_path
(
project
),
confirm:
"Leave project?"
,
method: :delete
,
remote:
true
,
class:
"btn-tiny btn remove-row"
,
title:
'Leave project'
do
%i
.icon-signout
Leave
-
if
project
.
forked_from_project
%small
.pull-right
%i
.icon-code-fork
...
...
@@ -80,6 +86,7 @@
%span
.light
Last activity:
%span
.date
=
project_last_activity
(
project
)
-
if
@projects
.
blank?
%li
%h3
.nothing_here_message
There are no projects here.
...
...
config/routes.rb
浏览文件 @
94f8b51c
...
...
@@ -288,6 +288,7 @@ Gitlab::Application.routes.draw do
resources
:team_members
,
except:
[
:index
,
:edit
],
constraints:
{
id:
/[a-zA-Z.\/0-9_\-#%+]+/
}
do
collection
do
delete
:leave
# Used for import team
# from another project
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录