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
Léo-Paul Géneau
gitlab-ce
Commits
32ebd438
Commit
32ebd438
authored
Nov 27, 2011
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #263 - dont display ajax loader on commit page if commits < limit
parent
814eeb45
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
app/controllers/commits_controller.rb
app/controllers/commits_controller.rb
+3
-3
app/views/commits/index.html.haml
app/views/commits/index.html.haml
+5
-4
No files found.
app/controllers/commits_controller.rb
View file @
32ebd438
...
@@ -12,12 +12,12 @@ class CommitsController < ApplicationController
...
@@ -12,12 +12,12 @@ class CommitsController < ApplicationController
def
index
def
index
@repo
=
project
.
repo
@repo
=
project
.
repo
limit
,
offset
=
(
params
[
:limit
]
||
20
),
(
params
[
:offset
]
||
0
)
@limit
,
@
offset
=
(
params
[
:limit
]
||
20
),
(
params
[
:offset
]
||
0
)
@commits
=
if
params
[
:path
]
@commits
=
if
params
[
:path
]
@repo
.
log
(
@ref
,
params
[
:path
],
:max_count
=>
limit
,
:skip
=>
offset
)
@repo
.
log
(
@ref
,
params
[
:path
],
:max_count
=>
@limit
,
:skip
=>
@
offset
)
else
else
@repo
.
commits
(
@ref
,
limit
,
offset
)
@repo
.
commits
(
@ref
,
@limit
,
@
offset
)
end
end
respond_to
do
|
format
|
respond_to
do
|
format
|
...
...
app/views/commits/index.html.haml
View file @
32ebd438
...
@@ -20,7 +20,8 @@
...
@@ -20,7 +20,8 @@
.loading
{
:style
=>
"display:none;"
}
.loading
{
:style
=>
"display:none;"
}
%center
=
image_tag
"ajax-loader.gif"
%center
=
image_tag
"ajax-loader.gif"
:javascript
-
if
@commits
.
count
==
@limit
$
(
function
(){
:javascript
CommitsList
.
init
(
"
#{
@ref
}
"
,
20
);
$
(
function
(){
});
CommitsList
.
init
(
"
#{
@ref
}
"
,
20
);
});
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