File tree 4 files changed +14
-4
lines changed
4 files changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -4,9 +4,16 @@ var Pager = {
4
4
disable :false ,
5
5
6
6
init :
7
- function ( limit ) {
7
+ function ( limit , preload ) {
8
8
this . limit = limit ;
9
- this . offset = limit ;
9
+
10
+ if ( preload ) {
11
+ this . offset = 0 ;
12
+ this . getOld ( ) ;
13
+ } else {
14
+ this . offset = limit ;
15
+ }
16
+
10
17
this . initLoadMore ( ) ;
11
18
} ,
12
19
Original file line number Diff line number Diff line change 7
7
= event_filter_link EventFilter.team, 'Team'
8
8
9
9
- if @events.any?
10
- .content_list = render @events
10
+ .content_list
11
11
- else
12
12
%p .nothing_here_message Projects activity will be displayed here
13
13
.loading.hide
Original file line number Diff line number Diff line change 8
8
- else
9
9
= render " zero_authorized_projects"
10
10
:javascript
11
- $ (function (){ Pager .init (20 ); });
11
+ $ (function (){ Pager .init (20 , true ); });
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ Feature: Dashboard
5
5
And project "Shop" has push event
6
6
And I visit dashboard page
7
7
8
+ @javascript
8
9
Scenario : I should see projects list
9
10
Then I should see "New Project" link
10
11
Then I should see "Shop" project link
@@ -26,11 +27,13 @@ Feature: Dashboard
26
27
And I click "Create Merge Request" link
27
28
Then I see prefilled new Merge Request page
28
29
30
+ @javascript
29
31
Scenario : I should see User joined Project event
30
32
Given user with name "John Doe" joined project "Shop"
31
33
When I visit dashboard page
32
34
Then I should see "John Doe joined project at Shop" event
33
35
36
+ @javascript
34
37
Scenario : I should see User left Project event
35
38
Given user with name "John Doe" joined project "Shop"
36
39
And user with name "John Doe" left project "Shop"
You can’t perform that action at this time.
0 commit comments