Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
48dea16a1ad2
Commit
48dea16a
authored
Sep 14, 2014
by
Dmitriy Zaporozhets
Browse files
Replace old references of users_project & users_group
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
de57579852b2
Changes
17
Hide whitespace changes
Inline
Side-by-side
app/controllers/profiles/notifications_controller.rb
View file @
48dea16a
...
...
@@ -3,8 +3,8 @@
def
show
@notification
=
current_user
.
notification
@
users_
projects
=
current_user
.
project_members
@
users_group
s
=
current_user
.
group_members
@project
_member
s
=
current_user
.
project_members
@
group_member
s
=
current_user
.
group_members
end
def
update
...
...
app/controllers/projects/team_members_controller.rb
View file @
48dea16a
...
...
@@ -6,7 +6,7 @@
def
index
@group
=
@project
.
group
@
users_
projects
=
@project
.
project_members
.
order
(
'access_level DESC'
)
@project
_member
s
=
@project
.
project_members
.
order
(
'access_level DESC'
)
end
def
new
...
...
app/models/project.rb
View file @
48dea16a
...
...
@@ -79,8 +79,8 @@
has_many
:snippets
,
dependent: :destroy
,
class_name:
"ProjectSnippet"
has_many
:hooks
,
dependent: :destroy
,
class_name:
"ProjectHook"
has_many
:protected_branches
,
dependent: :destroy
has_many
:
users_
projects
,
dependent: :destroy
has_many
:users
,
through: :
users_
projects
has_many
:project
_member
s
,
dependent: :destroy
,
as: :source
,
class_name:
'ProjectMember'
has_many
:users
,
through: :project
_member
s
has_many
:deploy_keys_projects
,
dependent: :destroy
has_many
:deploy_keys
,
through: :deploy_keys_projects
has_many
:users_star_projects
,
dependent: :destroy
...
...
@@ -353,8 +353,8 @@
def
team_member_by_name_or_email
(
name
=
nil
,
email
=
nil
)
user
=
users
.
where
(
"name like ? or email like ?"
,
name
,
email
).
first
users_
projects
.
where
(
user:
user
)
if
user
project
_member
s
.
where
(
user:
user
)
if
user
end
# Get Team Member record by user id
def
team_member_by_id
(
user_id
)
...
...
@@ -357,8 +357,8 @@
end
# Get Team Member record by user id
def
team_member_by_id
(
user_id
)
users_
projects
.
find_by
(
user_id:
user_id
)
project
_member
s
.
find_by
(
user_id:
user_id
)
end
def
name_with_namespace
...
...
@@ -555,7 +555,7 @@
end
def
project_member
(
user
)
users_
projects
.
where
(
user_id:
user
).
first
project
_member
s
.
where
(
user_id:
user
).
first
end
def
default_branch
...
...
app/models/user.rb
View file @
48dea16a
...
...
@@ -91,9 +91,9 @@
# Projects
has_many
:groups_projects
,
through: :groups
,
source: :projects
has_many
:personal_projects
,
through: :namespace
,
source: :projects
has_many
:projects
,
through: :
users_
projects
has_many
:projects
,
through: :project
_member
s
has_many
:created_projects
,
foreign_key: :creator_id
,
class_name:
'Project'
has_many
:users_star_projects
,
dependent: :destroy
has_many
:starred_projects
,
through: :users_star_projects
,
source: :project
has_many
:snippets
,
dependent: :destroy
,
foreign_key: :author_id
,
class_name:
"Snippet"
...
...
@@ -95,9 +95,9 @@
has_many
:created_projects
,
foreign_key: :creator_id
,
class_name:
'Project'
has_many
:users_star_projects
,
dependent: :destroy
has_many
:starred_projects
,
through: :users_star_projects
,
source: :project
has_many
:snippets
,
dependent: :destroy
,
foreign_key: :author_id
,
class_name:
"Snippet"
has_many
:
users_
projects
,
dependent: :destroy
has_many
:project
_member
s
,
dependent: :destroy
has_many
:issues
,
dependent: :destroy
,
foreign_key: :author_id
has_many
:notes
,
dependent: :destroy
,
foreign_key: :author_id
has_many
:merge_requests
,
dependent: :destroy
,
foreign_key: :author_id
...
...
@@ -177,7 +177,7 @@
scope
:in_team
,
->
(
team
){
where
(
id:
team
.
member_ids
)
}
scope
:not_in_team
,
->
(
team
){
where
(
'users.id NOT IN (:ids)'
,
ids:
team
.
member_ids
)
}
scope
:not_in_project
,
->
(
project
)
{
project
.
users
.
present?
?
where
(
"id not in (:ids)"
,
ids:
project
.
users
.
map
(
&
:id
)
)
:
all
}
scope
:without_projects
,
->
{
where
(
'id NOT IN (SELECT DISTINCT(user_id) FROM
users_
projects)'
)
}
scope
:without_projects
,
->
{
where
(
'id NOT IN (SELECT DISTINCT(user_id) FROM project
_member
s)'
)
}
scope
:ldap
,
->
{
where
(
provider:
'ldap'
)
}
scope
:potential_team_members
,
->
(
team
)
{
team
.
members
.
any?
?
active
.
not_in_team
(
team
)
:
active
}
...
...
app/views/admin/projects/show.html.haml
View file @
48dea16a
...
...
@@ -101,7 +101,7 @@
%i
.icon-edit
%ul
.well-list
-
@group_members
.
each
do
|
member
|
=
render
'
users_group
s/users_group'
,
member:
member
,
show_controls:
false
=
render
'
group_member
s/users_group'
,
member:
member
,
show_controls:
false
.panel-footer
=
paginate
@group_members
,
param_name:
'group_members_page'
,
theme:
'gitlab'
...
...
app/views/groups/_new_group_member.html.haml
View file @
48dea16a
=
form_for
@users_group
,
url:
group_
users_group
s_path
(
@group
),
html:
{
class:
'form-horizontal users-group-form'
}
do
|
f
|
=
form_for
@users_group
,
url:
group_
group_member
s_path
(
@group
),
html:
{
class:
'form-horizontal users-group-form'
}
do
|
f
|
.form-group
=
f
.
label
:user_ids
,
"People"
,
class:
'control-label'
.col-sm-10
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
'input-large'
)
...
...
app/views/groups/members.html.haml
View file @
48dea16a
...
...
@@ -32,7 +32,7 @@
(
#{
@members
.
total_count
}
)
%ul
.well-list
-
@members
.
each
do
|
member
|
=
render
'
users_group
s/users_group'
,
member:
member
,
show_roles:
show_roles
,
show_controls:
true
=
render
'
group_member
s/users_group'
,
member:
member
,
show_roles:
show_roles
,
show_controls:
true
=
paginate
@members
,
theme:
'gitlab'
:coffeescript
...
...
app/views/profiles/notifications/show.html.haml
View file @
48dea16a
...
...
@@ -39,10 +39,10 @@
.col-md-6
%h4
Groups:
%ul
.bordered-list
-
@
users_group
s
.
each
do
|
users_group
|
-
@
group_member
s
.
each
do
|
users_group
|
-
notification
=
Notification
.
new
(
users_group
)
=
render
'settings'
,
type:
'group'
,
membership:
users_group
,
notification:
notification
.col-md-6
%h4
Projects:
%ul
.bordered-list
...
...
@@ -43,9 +43,9 @@
-
notification
=
Notification
.
new
(
users_group
)
=
render
'settings'
,
type:
'group'
,
membership:
users_group
,
notification:
notification
.col-md-6
%h4
Projects:
%ul
.bordered-list
-
@
users_
projects
.
each
do
|
users_project
|
-
@project
_member
s
.
each
do
|
users_project
|
-
notification
=
Notification
.
new
(
users_project
)
=
render
'settings'
,
type:
'project'
,
membership:
users_project
,
notification:
notification
app/views/projects/team_members/_group_members.html.haml
View file @
48dea16a
...
...
@@ -8,7 +8,7 @@
%i
.icon-edit
%ul
.well-list
-
@group
.
group_members
.
order
(
'access_level DESC'
).
limit
(
20
).
each
do
|
member
|
=
render
'
users_group
s/users_group'
,
member:
member
,
show_controls:
false
=
render
'
group_member
s/users_group'
,
member:
member
,
show_controls:
false
-
if
group_users_count
>
20
%li
and
#{
group_users_count
-
20
}
more. For full list visit
#{
link_to
'group members page'
,
members_group_path
(
@group
)
}
app/views/projects/team_members/index.html.haml
View file @
48dea16a
...
...
@@ -11,6 +11,6 @@
%p
.light
Read more about project permissions
%strong
=
link_to
"here"
,
help_page_path
(
"permissions"
,
"permissions"
),
class:
"vlink"
=
render
"team"
,
members:
@
users_
projects
=
render
"team"
,
members:
@project
_member
s
-
if
@group
=
render
"group_members"
lib/tasks/gitlab/check.rake
View file @
48dea16a
...
...
@@ -17,7 +17,7 @@
check_database_config_exists
check_database_is_not_sqlite
check_migrations_are_up
check_orphaned_
users_group
s
check_orphaned_
group_member
s
check_gitlab_config_exists
check_gitlab_config_not_outdated
check_log_writable
...
...
@@ -194,7 +194,7 @@
end
end
def
check_orphaned_
users_group
s
def
check_orphaned_
group_member
s
print
"Database contains orphaned GroupMembers? ... "
if
GroupMember
.
where
(
"user_id not in (select id from users)"
).
count
>
0
puts
"yes"
.
red
...
...
spec/factories/users_groups.rb
View file @
48dea16a
# == Schema Information
#
# Table name:
users_group
s
# Table name:
group_member
s
#
# id :integer not null, primary key
# group_access :integer not null
...
...
spec/models/group_member_spec.rb
View file @
48dea16a
# == Schema Information
#
# Table name:
users_group
s
# Table name:
group_member
s
#
# id :integer not null, primary key
# group_access :integer not null
...
...
spec/models/group_spec.rb
View file @
48dea16a
...
...
@@ -20,7 +20,7 @@
describe
"Associations"
do
it
{
should
have_many
:projects
}
it
{
should
have_many
:
users_group
s
}
it
{
should
have_many
:
group_member
s
}
end
it
{
should
validate_presence_of
:name
}
...
...
spec/models/project_member_spec.rb
View file @
48dea16a
# == Schema Information
#
# Table name:
users_
projects
# Table name: project
_member
s
#
# id :integer not null, primary key
# user_id :integer not null
...
...
spec/models/project_spec.rb
View file @
48dea16a
...
...
@@ -38,7 +38,7 @@
it
{
should
have_many
(
:merge_requests
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:issues
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:milestones
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:
users_
projects
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:project
_member
s
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:notes
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:snippets
).
class_name
(
'ProjectSnippet'
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:deploy_keys_projects
).
dependent
(
:destroy
)
}
...
...
spec/models/user_spec.rb
View file @
48dea16a
...
...
@@ -52,7 +52,7 @@
describe
"Associations"
do
it
{
should
have_one
(
:namespace
)
}
it
{
should
have_many
(
:snippets
).
class_name
(
'Snippet'
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:
users_
projects
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:project
_member
s
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:groups
)
}
it
{
should
have_many
(
:keys
).
dependent
(
:destroy
)
}
it
{
should
have_many
(
:events
).
class_name
(
'Event'
).
dependent
(
:destroy
)
}
...
...
Write
Preview
Supports
Markdown
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