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
2a63f64f
Commit
2a63f64f
authored
Jun 18, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove team factories and few links
parent
439f399b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
70 deletions
+0
-70
app/controllers/team_members_controller.rb
app/controllers/team_members_controller.rb
+0
-1
app/views/team_members/index.html.haml
app/views/team_members/index.html.haml
+0
-2
spec/factories/user_team_project_relationships.rb
spec/factories/user_team_project_relationships.rb
+0
-21
spec/factories/user_team_user_relationships.rb
spec/factories/user_team_user_relationships.rb
+0
-23
spec/factories/user_teams.rb
spec/factories/user_teams.rb
+0
-23
No files found.
app/controllers/team_members_controller.rb
View file @
2a63f64f
...
@@ -6,7 +6,6 @@ class TeamMembersController < ProjectResourceController
...
@@ -6,7 +6,6 @@ class TeamMembersController < ProjectResourceController
def
index
def
index
@group
=
@project
.
group
@group
=
@project
.
group
@users_projects
=
@project
.
users_projects
.
order
(
'project_access DESC'
)
@users_projects
=
@project
.
users_projects
.
order
(
'project_access DESC'
)
@assigned_teams
=
@project
.
user_team_project_relationships
end
end
def
new
def
new
...
...
app/views/team_members/index.html.haml
View file @
2a63f64f
...
@@ -6,8 +6,6 @@
...
@@ -6,8 +6,6 @@
%span
.pull-right
%span
.pull-right
=
link_to
import_project_team_members_path
(
@project
),
class:
"btn btn-small grouped"
,
title:
"Import team from another project"
do
=
link_to
import_project_team_members_path
(
@project
),
class:
"btn btn-small grouped"
,
title:
"Import team from another project"
do
Import team from another project
Import team from another project
=
link_to
available_project_teams_path
(
@project
),
class:
"btn btn-small grouped"
,
title:
"Assign project to team of users"
do
Assign project to Team of users
=
link_to
new_project_team_member_path
(
@project
),
class:
"btn btn-primary small grouped"
,
title:
"New Team Member"
do
=
link_to
new_project_team_member_path
(
@project
),
class:
"btn btn-primary small grouped"
,
title:
"New Team Member"
do
New Team Member
New Team Member
...
...
spec/factories/user_team_project_relationships.rb
deleted
100644 → 0
View file @
439f399b
# == Schema Information
#
# Table name: user_team_project_relationships
#
# id :integer not null, primary key
# project_id :integer
# user_team_id :integer
# greatest_access :integer
# created_at :datetime not null
# updated_at :datetime not null
#
# Read about factories at https://github.com/thoughtbot/factory_girl
FactoryGirl
.
define
do
factory
:user_team_project_relationship
do
project
user_team
greatest_access
{
UsersProject
::
MASTER
}
end
end
spec/factories/user_team_user_relationships.rb
deleted
100644 → 0
View file @
439f399b
# == Schema Information
#
# Table name: user_team_user_relationships
#
# id :integer not null, primary key
# user_id :integer
# user_team_id :integer
# group_admin :boolean
# permission :integer
# created_at :datetime not null
# updated_at :datetime not null
#
# Read about factories at https://github.com/thoughtbot/factory_girl
FactoryGirl
.
define
do
factory
:user_team_user_relationship
do
user
user_team
group_admin
false
permission
{
UsersProject
::
MASTER
}
end
end
spec/factories/user_teams.rb
deleted
100644 → 0
View file @
439f399b
# == Schema Information
#
# Table name: user_teams
#
# id :integer not null, primary key
# name :string(255)
# path :string(255)
# owner_id :integer
# created_at :datetime not null
# updated_at :datetime not null
# description :string(255) default(""), not null
#
# Read about factories at https://github.com/thoughtbot/factory_girl
FactoryGirl
.
define
do
factory
:user_team
do
sequence
(
:name
)
{
|
n
|
"team
#{
n
}
"
}
sequence
(
:description
)
{
|
n
|
"team_description
#{
n
}
"
}
path
{
name
.
downcase
.
gsub
(
/\s/
,
'_'
)
}
owner
end
end
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