Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
3ba0a2f26ca6
Commit
085538c2
authored
Mar 19, 2016
by
Robert Speicher
Browse files
Use the configured Kaminari "per page" default
parent
af9c6609f1e6
Changes
28
Hide whitespace changes
Inline
Side-by-side
app/controllers/admin/groups_controller.rb
View file @
3ba0a2f2
...
...
@@ -5,12 +5,12 @@ def index
@groups
=
Group
.
all
@groups
=
@groups
.
sort
(
@sort
=
params
[
:sort
])
@groups
=
@groups
.
search
(
params
[
:name
])
if
params
[
:name
].
present?
@groups
=
@groups
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@groups
=
@groups
.
page
(
params
[
:page
])
end
def
show
@members
=
@group
.
members
.
order
(
"access_level DESC"
).
page
(
params
[
:members_page
])
.
per
(
PER_PAGE
)
@projects
=
@group
.
projects
.
page
(
params
[
:projects_page
])
.
per
(
PER_PAGE
)
@members
=
@group
.
members
.
order
(
"access_level DESC"
).
page
(
params
[
:members_page
])
@projects
=
@group
.
projects
.
page
(
params
[
:projects_page
])
end
def
new
...
...
app/controllers/admin/labels_controller.rb
View file @
3ba0a2f2
...
...
@@ -2,7 +2,7 @@ class Admin::LabelsController < Admin::ApplicationController
before_action
:set_label
,
only:
[
:show
,
:edit
,
:update
,
:destroy
]
def
index
@labels
=
Label
.
templates
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@labels
=
Label
.
templates
.
page
(
params
[
:page
])
end
def
show
...
...
app/controllers/admin/projects_controller.rb
View file @
3ba0a2f2
...
...
@@ -12,15 +12,15 @@ def index
@projects
=
@projects
.
non_archived
unless
params
[
:with_archived
].
present?
@projects
=
@projects
.
search
(
params
[
:name
])
if
params
[
:name
].
present?
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
includes
(
:namespace
).
order
(
"namespaces.path, projects.name ASC"
).
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@projects
=
@projects
.
includes
(
:namespace
).
order
(
"namespaces.path, projects.name ASC"
).
page
(
params
[
:page
])
end
def
show
if
@group
@group_members
=
@group
.
members
.
order
(
"access_level DESC"
).
page
(
params
[
:group_members_page
])
.
per
(
PER_PAGE
)
@group_members
=
@group
.
members
.
order
(
"access_level DESC"
).
page
(
params
[
:group_members_page
])
end
@project_members
=
@project
.
project_members
.
page
(
params
[
:project_members_page
])
.
per
(
PER_PAGE
)
@project_members
=
@project
.
project_members
.
page
(
params
[
:project_members_page
])
end
def
transfer
...
...
app/controllers/application_controller.rb
View file @
3ba0a2f2
...
...
@@ -6,8 +6,6 @@ class ApplicationController < ActionController::Base
include
GitlabRoutingHelper
include
PageLayoutHelper
PER_PAGE
=
20
before_action
:authenticate_user_from_token!
before_action
:authenticate_user!
before_action
:validate_user_service_ticket!
...
...
app/controllers/autocomplete_controller.rb
View file @
3ba0a2f2
...
...
@@ -7,7 +7,7 @@ def users
@users
=
@users
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@users
=
@users
.
active
@users
=
@users
.
reorder
(
:name
)
@users
=
@users
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@users
=
@users
.
page
(
params
[
:page
])
if
params
[
:search
].
blank?
# Include current user if available to filter by "Me"
...
...
app/controllers/concerns/global_milestones.rb
View file @
3ba0a2f2
...
...
@@ -6,7 +6,7 @@ def milestones
@milestones
=
MilestonesFinder
.
new
.
execute
(
@projects
,
params
)
@milestones
=
GlobalMilestone
.
build_collection
(
@milestones
)
@milestones
=
@milestones
.
sort_by
{
|
x
|
x
.
due_date
.
nil?
?
epoch
:
x
.
due_date
}
@milestones
=
Kaminari
.
paginate_array
(
@milestones
).
page
(
params
[
:page
])
.
per
(
ApplicationController
::
PER_PAGE
)
@milestones
=
Kaminari
.
paginate_array
(
@milestones
).
page
(
params
[
:page
])
end
def
milestone
...
...
app/controllers/concerns/issues_action.rb
View file @
3ba0a2f2
...
...
@@ -3,7 +3,7 @@ module IssuesAction
def
issues
@issues
=
get_issues_collection
.
non_archived
@issues
=
@issues
.
page
(
params
[
:page
])
.
per
(
ApplicationController
::
PER_PAGE
)
@issues
=
@issues
.
page
(
params
[
:page
])
@issues
=
@issues
.
preload
(
:author
,
:project
)
@label
=
@issuable_finder
.
labels
.
first
...
...
app/controllers/concerns/merge_requests_action.rb
View file @
3ba0a2f2
...
...
@@ -3,7 +3,7 @@ module MergeRequestsAction
def
merge_requests
@merge_requests
=
get_merge_requests_collection
.
non_archived
@merge_requests
=
@merge_requests
.
page
(
params
[
:page
])
.
per
(
ApplicationController
::
PER_PAGE
)
@merge_requests
=
@merge_requests
.
page
(
params
[
:page
])
@merge_requests
=
@merge_requests
.
preload
(
:author
,
:target_project
)
@label
=
@issuable_finder
.
labels
.
first
...
...
app/controllers/dashboard/groups_controller.rb
View file @
3ba0a2f2
class
Dashboard::GroupsController
<
Dashboard
::
ApplicationController
def
index
@group_members
=
current_user
.
group_members
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@group_members
=
current_user
.
group_members
.
page
(
params
[
:page
])
end
end
app/controllers/dashboard/projects_controller.rb
View file @
3ba0a2f2
...
...
@@ -8,7 +8,7 @@ def index
@projects
=
filter_projects
(
@projects
)
@projects
=
@projects
.
includes
(
:namespace
)
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@projects
=
@projects
.
page
(
params
[
:page
])
@last_push
=
current_user
.
recent_push
...
...
@@ -32,7 +32,7 @@ def starred
@projects
=
filter_projects
(
@projects
)
@projects
=
@projects
.
includes
(
:namespace
,
:forked_from_project
,
:tags
)
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@projects
=
@projects
.
page
(
params
[
:page
])
@last_push
=
current_user
.
recent_push
@groups
=
[]
...
...
app/controllers/dashboard/snippets_controller.rb
View file @
3ba0a2f2
...
...
@@ -6,6 +6,6 @@ def index
user:
current_user
,
scope:
params
[
:scope
]
)
@snippets
=
@snippets
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@snippets
=
@snippets
.
page
(
params
[
:page
])
end
end
app/controllers/dashboard/todos_controller.rb
View file @
3ba0a2f2
...
...
@@ -2,7 +2,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
before_action
:find_todos
,
only:
[
:index
,
:destroy
,
:destroy_all
]
def
index
@todos
=
@todos
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@todos
=
@todos
.
page
(
params
[
:page
])
end
def
destroy
...
...
app/controllers/explore/groups_controller.rb
View file @
3ba0a2f2
...
...
@@ -3,6 +3,6 @@ def index
@groups
=
Group
.
order_id_desc
@groups
=
@groups
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@groups
=
@groups
.
sort
(
@sort
=
params
[
:sort
])
@groups
=
@groups
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@groups
=
@groups
.
page
(
params
[
:page
])
end
end
app/controllers/explore/projects_controller.rb
View file @
3ba0a2f2
...
...
@@ -8,7 +8,7 @@ def index
@projects
=
@projects
.
where
(
visibility_level:
params
[
:visibility_level
])
if
params
[
:visibility_level
].
present?
@projects
=
filter_projects
(
@projects
)
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
includes
(
:namespace
).
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@projects
=
@projects
.
includes
(
:namespace
).
page
(
params
[
:page
])
respond_to
do
|
format
|
format
.
html
...
...
@@ -23,7 +23,7 @@ def index
def
trending
@projects
=
TrendingProjectsFinder
.
new
.
execute
(
current_user
)
@projects
=
filter_projects
(
@projects
)
@projects
=
@projects
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@projects
=
@projects
.
page
(
params
[
:page
])
respond_to
do
|
format
|
format
.
html
...
...
@@ -39,7 +39,7 @@ def starred
@projects
=
ProjectsFinder
.
new
.
execute
(
current_user
)
@projects
=
filter_projects
(
@projects
)
@projects
=
@projects
.
reorder
(
'star_count DESC'
)
@projects
=
@projects
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@projects
=
@projects
.
page
(
params
[
:page
])
respond_to
do
|
format
|
format
.
html
...
...
app/controllers/explore/snippets_controller.rb
View file @
3ba0a2f2
class
Explore::SnippetsController
<
Explore
::
ApplicationController
def
index
@snippets
=
SnippetsFinder
.
new
.
execute
(
current_user
,
filter: :all
)
@snippets
=
@snippets
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@snippets
=
@snippets
.
page
(
params
[
:page
])
end
end
app/controllers/groups_controller.rb
View file @
3ba0a2f2
...
...
@@ -44,7 +44,7 @@ def show
@projects
=
@projects
.
includes
(
:namespace
)
@projects
=
filter_projects
(
@projects
)
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
if
params
[
:filter_projects
].
blank?
@projects
=
@projects
.
page
(
params
[
:page
])
if
params
[
:filter_projects
].
blank?
@shared_projects
=
@group
.
shared_projects
...
...
app/controllers/profiles_controller.rb
View file @
3ba0a2f2
...
...
@@ -34,8 +34,7 @@ def reset_private_token
def
audit_log
@events
=
AuditEvent
.
where
(
entity_type:
"User"
,
entity_id:
current_user
.
id
).
order
(
"created_at DESC"
).
page
(
params
[
:page
]).
per
(
PER_PAGE
)
page
(
params
[
:page
])
end
def
update_username
...
...
app/controllers/projects/branches_controller.rb
View file @
3ba0a2f2
...
...
@@ -8,7 +8,7 @@ class Projects::BranchesController < Projects::ApplicationController
def
index
@sort
=
params
[
:sort
]
||
'name'
@branches
=
@repository
.
branches_sorted_by
(
@sort
)
@branches
=
Kaminari
.
paginate_array
(
@branches
).
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@branches
=
Kaminari
.
paginate_array
(
@branches
).
page
(
params
[
:page
])
@max_commits
=
@branches
.
reduce
(
0
)
do
|
memo
,
branch
|
diverging_commit_counts
=
repository
.
diverging_commit_counts
(
branch
)
...
...
app/controllers/projects/forks_controller.rb
View file @
3ba0a2f2
...
...
@@ -15,7 +15,7 @@ def index
@sort
=
params
[
:sort
]
||
'id_desc'
@forks
=
@forks
.
search
(
params
[
:filter_projects
])
if
params
[
:filter_projects
].
present?
@forks
=
@forks
.
order_by
(
@sort
).
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@forks
=
@forks
.
order_by
(
@sort
).
page
(
params
[
:page
])
respond_to
do
|
format
|
format
.
html
...
...
app/controllers/projects/issues_controller.rb
View file @
3ba0a2f2
...
...
@@ -33,7 +33,7 @@ def index
end
end
@issues
=
@issues
.
page
(
params
[
:page
])
.
per
(
PER_PAGE
)
@issues
=
@issues
.
page
(
params
[
:page
])
@label
=
@project
.
labels
.
find_by
(
title:
params
[
:label_name
])
respond_to
do
|
format
|
...
...
Prev
1
2
Next
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