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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
61d98601
Commit
61d98601
authored
Aug 27, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove team mentions
parent
bbc916ba
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-1
app/views/projects/_clone_panel.html.haml
app/views/projects/_clone_panel.html.haml
+2
-2
app/views/projects/team_members/_form.html.haml
app/views/projects/team_members/_form.html.haml
+3
-3
app/views/projects/team_members/index.html.haml
app/views/projects/team_members/index.html.haml
+3
-3
No files found.
app/views/groups/edit.html.haml
View file @
61d98601
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
=
private_icon
=
private_icon
=
link_to
project
.
name_with_namespace
,
project
=
link_to
project
.
name_with_namespace
,
project
.pull-right
.pull-right
=
link_to
'
Team
'
,
project_team_index_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
=
link_to
'
Members
'
,
project_team_index_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
=
link_to
'Edit'
,
edit_project_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
=
link_to
'Edit'
,
edit_project_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
=
link_to
'Remove'
,
project
,
confirm:
remove_project_message
(
project
),
method: :delete
,
class:
"btn btn-small btn-remove"
=
link_to
'Remove'
,
project
,
confirm:
remove_project_message
(
project
),
method: :delete
,
class:
"btn btn-small btn-remove"
-
if
@group
.
projects
.
blank?
-
if
@group
.
projects
.
blank?
...
...
app/views/projects/_clone_panel.html.haml
View file @
61d98601
...
@@ -40,5 +40,5 @@
...
@@ -40,5 +40,5 @@
-
if
can?
(
current_user
,
:admin_team_member
,
@project
)
-
if
can?
(
current_user
,
:admin_team_member
,
@project
)
%li
.divider
%li
.divider
%li
%li
=
link_to
new_project_team_member_path
(
@project
),
title:
"New
Team
member"
do
=
link_to
new_project_team_member_path
(
@project
),
title:
"New
project
member"
do
Team
member
Project
member
app/views/projects/team_members/_form.html.haml
View file @
61d98601
%h3
.page-title
%h3
.page-title
=
"New
Team
member(s)"
=
"New
project
member(s)"
=
form_for
@user_project_relation
,
as: :team_member
,
url:
project_team_members_path
(
@project
)
do
|
f
|
=
form_for
@user_project_relation
,
as: :team_member
,
url:
project_team_members_path
(
@project
)
do
|
f
|
-
if
@user_project_relation
.
errors
.
any?
-
if
@user_project_relation
.
errors
.
any?
...
@@ -8,13 +8,13 @@
...
@@ -8,13 +8,13 @@
-
@user_project_relation
.
errors
.
full_messages
.
each
do
|
msg
|
-
@user_project_relation
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
%
h6
1. Choose people you want in the team
%
p
1. Choose people you want in the project
.control-group
.control-group
=
f
.
label
:user_ids
,
"People"
=
f
.
label
:user_ids
,
"People"
.controls
.controls
=
users_select_tag
(
:user_ids
,
multiple:
true
)
=
users_select_tag
(
:user_ids
,
multiple:
true
)
%
h6
2. Set access level for them
%
p
2. Set access level for them
.control-group
.control-group
=
f
.
label
:project_access
,
"Project Access"
=
f
.
label
:project_access
,
"Project Access"
.controls
=
select_tag
:project_access
,
options_for_select
(
Gitlab
::
Access
.
options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
.controls
=
select_tag
:project_access
,
options_for_select
(
Gitlab
::
Access
.
options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
...
...
app/views/projects/team_members/index.html.haml
View file @
61d98601
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
-
if
can?
current_user
,
:admin_team_member
,
@project
-
if
can?
current_user
,
:admin_team_member
,
@project
%span
.pull-right
%span
.pull-right
=
link_to
new_project_team_member_path
(
@project
),
class:
"btn btn-new grouped"
,
title:
"New
Team M
ember"
do
=
link_to
new_project_team_member_path
(
@project
),
class:
"btn btn-new grouped"
,
title:
"New
project m
ember"
do
New
Team M
ember
New
project m
ember
=
link_to
import_project_team_members_path
(
@project
),
class:
"btn grouped"
,
title:
"Import
team
from another project"
do
=
link_to
import_project_team_members_path
(
@project
),
class:
"btn grouped"
,
title:
"Import
members
from another project"
do
Import members
Import members
%p
.light
%p
.light
...
...
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