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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
b3ef63a0
Commit
b3ef63a0
authored
Jun 19, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate global project taks. Removed more teams related functionality
parent
cf8b465c
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
7 additions
and
98 deletions
+7
-98
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+0
-8
app/helpers/admin/teams/members_helper.rb
app/helpers/admin/teams/members_helper.rb
+0
-5
app/helpers/admin/teams/projects_helper.rb
app/helpers/admin/teams/projects_helper.rb
+0
-5
app/helpers/namespaces_helper.rb
app/helpers/namespaces_helper.rb
+0
-1
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+0
-1
app/models/project.rb
app/models/project.rb
+0
-6
app/views/dashboard/_teams.html.haml
app/views/dashboard/_teams.html.haml
+0
-23
app/views/layouts/nav/_team.html.haml
app/views/layouts/nav/_team.html.haml
+0
-25
app/views/team_members/_assigned_team.html.haml
app/views/team_members/_assigned_team.html.haml
+0
-10
app/views/team_members/_assigned_teams.html.haml
app/views/team_members/_assigned_teams.html.haml
+0
-4
app/views/team_members/index.html.haml
app/views/team_members/index.html.haml
+0
-7
lib/tasks/migrate/migrate_global_projects.rake
lib/tasks/migrate/migrate_global_projects.rake
+7
-3
No files found.
app/controllers/application_controller.rb
View file @
b3ef63a0
...
@@ -95,14 +95,6 @@ class ApplicationController < ActionController::Base
...
@@ -95,14 +95,6 @@ class ApplicationController < ActionController::Base
return
access_denied!
unless
can?
(
current_user
,
:create_team
,
nil
)
return
access_denied!
unless
can?
(
current_user
,
:create_team
,
nil
)
end
end
def
authorize_manage_user_team!
return
access_denied!
unless
user_team
.
present?
&&
can?
(
current_user
,
:manage_user_team
,
user_team
)
end
def
authorize_admin_user_team!
return
access_denied!
unless
user_team
.
present?
&&
can?
(
current_user
,
:admin_user_team
,
user_team
)
end
def
access_denied!
def
access_denied!
render
"errors/access_denied"
,
layout:
"errors"
,
status:
404
render
"errors/access_denied"
,
layout:
"errors"
,
status:
404
end
end
...
...
app/helpers/admin/teams/members_helper.rb
deleted
100644 → 0
View file @
cf8b465c
module
Admin::Teams::MembersHelper
def
member_since
(
team
,
member
)
team
.
user_team_user_relationships
.
find_by_user_id
(
member
).
created_at
end
end
app/helpers/admin/teams/projects_helper.rb
deleted
100644 → 0
View file @
cf8b465c
module
Admin::Teams::ProjectsHelper
def
assigned_since
(
team
,
project
)
team
.
user_team_project_relationships
.
find_by_project_id
(
project
).
created_at
end
end
app/helpers/namespaces_helper.rb
View file @
b3ef63a0
...
@@ -7,7 +7,6 @@ module NamespacesHelper
...
@@ -7,7 +7,6 @@ module NamespacesHelper
users_opts
=
[
"Users"
,
users
.
sort_by
(
&
:human_name
).
map
{
|
u
|
[
u
.
human_name
,
u
.
id
]}
]
users_opts
=
[
"Users"
,
users
.
sort_by
(
&
:human_name
).
map
{
|
u
|
[
u
.
human_name
,
u
.
id
]}
]
options
=
[]
options
=
[]
options
<<
global_opts
if
current_user
.
admin
options
<<
group_opts
options
<<
group_opts
options
<<
users_opts
options
<<
users_opts
...
...
app/models/concerns/issuable.rb
View file @
b3ef63a0
...
@@ -21,7 +21,6 @@ module Issuable
...
@@ -21,7 +21,6 @@ module Issuable
scope
:opened
,
->
{
with_state
(
:opened
)
}
scope
:opened
,
->
{
with_state
(
:opened
)
}
scope
:closed
,
->
{
with_state
(
:closed
)
}
scope
:closed
,
->
{
with_state
(
:closed
)
}
scope
:of_group
,
->
(
group
)
{
where
(
project_id:
group
.
project_ids
)
}
scope
:of_group
,
->
(
group
)
{
where
(
project_id:
group
.
project_ids
)
}
scope
:of_user_team
,
->
(
team
)
{
where
(
project_id:
team
.
project_ids
,
assignee_id:
team
.
member_ids
)
}
scope
:assigned_to
,
->
(
u
)
{
where
(
assignee_id:
u
.
id
)}
scope
:assigned_to
,
->
(
u
)
{
where
(
assignee_id:
u
.
id
)}
scope
:recent
,
->
{
order
(
"created_at DESC"
)
}
scope
:recent
,
->
{
order
(
"created_at DESC"
)
}
scope
:assigned
,
->
{
where
(
"assignee_id IS NOT NULL"
)
}
scope
:assigned
,
->
{
where
(
"assignee_id IS NOT NULL"
)
}
...
...
app/models/project.rb
View file @
b3ef63a0
...
@@ -61,12 +61,6 @@ class Project < ActiveRecord::Base
...
@@ -61,12 +61,6 @@ class Project < ActiveRecord::Base
has_many
:snippets
,
dependent: :destroy
,
class_name:
"ProjectSnippet"
has_many
:snippets
,
dependent: :destroy
,
class_name:
"ProjectSnippet"
has_many
:hooks
,
dependent: :destroy
,
class_name:
"ProjectHook"
has_many
:hooks
,
dependent: :destroy
,
class_name:
"ProjectHook"
has_many
:protected_branches
,
dependent: :destroy
has_many
:protected_branches
,
dependent: :destroy
has_many
:user_team_project_relationships
,
dependent: :destroy
has_many
:users
,
through: :users_projects
has_many
:user_teams
,
through: :user_team_project_relationships
has_many
:user_team_user_relationships
,
through: :user_teams
has_many
:user_teams_members
,
through: :user_team_user_relationships
has_many
:deploy_keys_projects
,
dependent: :destroy
has_many
:deploy_keys_projects
,
dependent: :destroy
has_many
:deploy_keys
,
through: :deploy_keys_projects
has_many
:deploy_keys
,
through: :deploy_keys_projects
...
...
app/views/dashboard/_teams.html.haml
deleted
100644 → 0
View file @
cf8b465c
.ui-box.teams-box
%h5
.title
Teams
%span
.light
(
#{
teams
.
count
}
)
%span
.pull-right
=
link_to
new_team_path
,
class:
"btn btn-small"
do
%i
.icon-plus
New Team
%ul
.well-list
-
teams
.
each
do
|
team
|
%li
=
link_to
team_path
(
id:
team
.
path
),
class:
dom_class
(
team
)
do
%strong
.well-title
=
truncate
(
team
.
name
,
length:
35
)
%span
.pull-right.light
-
if
team
.
owner
==
current_user
%i
.icon-wrench
-
tm
=
current_user
.
user_team_user_relationships
.
find_by_user_team_id
(
team
.
id
)
-
if
tm
=
tm
.
access_human
-
if
teams
.
blank?
%li
%h3
.nothing_here_message
You have no teams yet.
app/views/layouts/nav/_team.html.haml
deleted
100644 → 0
View file @
cf8b465c
%ul
=
nav_link
(
path:
'teams#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
team_path
(
@team
),
title:
"Home"
do
%i
.icon-home
=
nav_link
(
path:
'teams#issues'
)
do
=
link_to
issues_team_path
(
@team
)
do
Issues
%span
.count
=
Issue
.
opened
.
of_user_team
(
@team
).
count
=
nav_link
(
path:
'teams#merge_requests'
)
do
=
link_to
merge_requests_team_path
(
@team
)
do
Merge Requests
%span
.count
=
MergeRequest
.
opened
.
of_user_team
(
@team
).
count
=
nav_link
(
controller:
[
:members
])
do
=
link_to
team_members_path
(
@team
),
class:
"team-tab tab"
do
Members
%span
.count
=
@team
.
members
.
count
-
if
can?
current_user
,
:manage_user_team
,
@team
=
nav_link
(
path:
'teams#edit'
)
do
=
link_to
edit_team_path
(
@team
),
class:
"stat-tab tab "
do
Settings
app/views/team_members/_assigned_team.html.haml
deleted
100644 → 0
View file @
cf8b465c
%li
{
id:
dom_id
(
team
),
class:
"user_team_row team_#{team.id}"
}
.pull-right
-
if
can?
(
current_user
,
:admin_team_member
,
@project
)
=
link_to
resign_project_team_path
(
@project
,
team
),
method: :delete
,
confirm:
"Are you sure?"
,
class:
"btn btn-remove btn-tiny"
do
%i
.icon-minus.icon-white
%strong
=
link_to
team
.
name
,
team_path
(
team
),
title:
team
.
name
,
class:
"dark"
%br
%small
.cgray
Members:
#{
team
.
members
.
count
}
%small
.cgray
Max access:
#{
team_relation
.
human_max_access
}
app/views/team_members/_assigned_teams.html.haml
deleted
100644 → 0
View file @
cf8b465c
.ui-box
%ul
.well-list
-
assigned_teams
.
sort_by
(
&
:team_name
).
each
do
|
team_relation
|
=
render
"team_members/assigned_team"
,
team_relation:
team_relation
,
team:
team_relation
.
user_team
app/views/team_members/index.html.haml
View file @
b3ef63a0
...
@@ -24,10 +24,3 @@
...
@@ -24,10 +24,3 @@
-
else
-
else
=
render
"team_members/team"
,
members:
@users_projects
=
render
"team_members/team"
,
members:
@users_projects
-
if
@assigned_teams
.
present?
%h5
Assigned teams
(
#{
@project
.
user_teams
.
count
}
)
%div
=
render
"team_members/assigned_teams"
,
assigned_teams:
@assigned_teams
lib/tasks/migrate/migrate_global_projects.rake
View file @
b3ef63a0
...
@@ -4,9 +4,13 @@ task migrate_global_projects: :environment do
...
@@ -4,9 +4,13 @@ task migrate_global_projects: :environment do
ask_to_continue
ask_to_continue
Project
.
where
(
namespace_id:
nil
).
find_each
(
batch_size:
20
)
do
|
project
|
Project
.
where
(
namespace_id:
nil
).
find_each
(
batch_size:
20
)
do
|
project
|
begin
# TODO: transfer code here
project
.
transfer
(
project
.
owner
.
namespace
)
print
'.'
print
'.'
rescue
=>
ex
puts
ex
.
message
print
'F'
end
end
end
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