Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (6)
(fix): bad paths for cypress artifacts
· 5e3aa0b0
Mark Harding
authored
Aug 02, 2019
5e3aa0b0
(feat): infinite newsfeed scrolls - closes
engine#692
· a8b4cc9a
Mark Harding
authored
Aug 03, 2019
a8b4cc9a
(chore): remove 40 post boost cap
· 4bbb05e5
Mark Harding
authored
Aug 03, 2019
4bbb05e5
(fix): prevent fetching the entire feed to refresh when simply scrolling
· 14aa9c6d
Mark Harding
authored
Aug 03, 2019
14aa9c6d
(chore): show boosts every 5 slots, vs 8
· 4f14088f
Mark Harding
authored
Aug 03, 2019
4f14088f
Merge remote-tracking branch 'origin/master' into fix/comments-media-gallery-1601
· 43dc7ff6
Brian Hatchet
authored
Aug 05, 2019
43dc7ff6
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
43dc7ff6
...
...
@@ -44,8 +44,8 @@ e2e:base:
artifacts
:
when
:
always
paths
:
-
cypress/screenshots
/**/*.mp4
-
cypress/videos
/**/*.mp4
-
cypress/screenshots
-
cypress/videos
cache
:
paths
:
-
.npm
...
...
@@ -71,8 +71,8 @@ e2e:chrome:
artifacts
:
when
:
always
paths
:
-
cypress/screenshots
/**/*.mp4
-
cypress/videos
/**/*.mp4
-
cypress/screenshots
-
cypress/videos
cache
:
paths
:
-
.npm
...
...
src/app/common/services/entities.service.ts
View file @
43dc7ff6
...
...
@@ -43,7 +43,7 @@ export class EntitiesService {
if
(
!
this
.
entities
.
has
(
feedItem
.
urn
))
{
urnsToFetch
.
push
(
feedItem
.
urn
);
}
if
(
this
.
entities
.
has
(
feedItem
.
urn
)
&&
!
feedItem
.
entity
)
{
if
(
this
.
entities
.
has
(
feedItem
.
urn
)
&&
!
feedItem
.
entity
&&
feed
.
length
<
20
)
{
urnsToResync
.
push
(
feedItem
.
urn
);
}
}
...
...
src/app/modules/newsfeed/feeds/sorted.component.ts
View file @
43dc7ff6
...
...
@@ -299,6 +299,6 @@ export class NewsfeedSortedComponent implements OnInit, OnDestroy {
// return false;
//}
return
(
i
>
0
&&
(
i
%
5
)
===
0
&&
i
<=
80
)
||
i
===
1
;
return
(
i
>
0
&&
(
i
%
5
)
===
0
)
||
i
===
1
;
}
}
src/app/modules/newsfeed/feeds/subscribed.component.html
View file @
43dc7ff6
...
...
@@ -11,7 +11,7 @@
<ng-container
*ngFor=
"let activity$ of (feedsService.feed | async); let i = index"
>
<ng-container
*mIfFeature=
"'es-feeds'"
>
<m-featured-content
*ngIf=
"(i > 0 && (i %
8
) === 0
&& i <= 40
) || i === 2"
*ngIf=
"(i > 0 && (i %
5
) === 0) || i === 2"
[slot]=
"i + 1"
></m-featured-content>
</ng-container>
...
...
src/app/modules/newsfeed/feeds/subscribed.component.ts
View file @
43dc7ff6
...
...
@@ -125,6 +125,12 @@ export class NewsfeedSubscribedComponent {
loadNext
()
{
if
(
this
.
featuresService
.
has
(
'
es-feeds
'
))
{
if
(
this
.
feedsService
.
canFetchMore
&&
!
this
.
feedsService
.
inProgress
.
getValue
()
&&
this
.
feedsService
.
offset
.
getValue
()
)
{
this
.
feedsService
.
fetch
();
// load the next 150 in the background
}
this
.
feedsService
.
loadMore
();
}
else
{
this
.
loadLegacy
();
...
...