BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
db549f5d
Unverified
Commit
db549f5d
authored
Aug 08, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed activity not loading on project homepage
parent
0ec87b3b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
dispatcher.js
app/assets/javascripts/dispatcher.js
+1
-0
projects_spec.rb
spec/features/projects_spec.rb
+15
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
db549f5d
...
@@ -343,6 +343,7 @@ import UserFeatureHelper from './helpers/user_feature_helper';
...
@@ -343,6 +343,7 @@ import UserFeatureHelper from './helpers/user_feature_helper';
if
(
$
(
'#tree-slider'
).
length
)
new
TreeView
();
if
(
$
(
'#tree-slider'
).
length
)
new
TreeView
();
if
(
$
(
'.blob-viewer'
).
length
)
new
BlobViewer
();
if
(
$
(
'.blob-viewer'
).
length
)
new
BlobViewer
();
if
(
$
(
'.project-show-activity'
).
length
)
new
gl
.
Activities
();
break
;
break
;
case
'projects:edit'
:
case
'projects:edit'
:
setupProjectEdit
();
setupProjectEdit
();
...
...
spec/features/projects_spec.rb
View file @
db549f5d
...
@@ -167,6 +167,21 @@ feature 'Project' do
...
@@ -167,6 +167,21 @@ feature 'Project' do
end
end
end
end
describe
'activity view'
do
let
(
:user
)
{
create
(
:user
,
project_view:
'activity'
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
before
do
project
.
team
<<
[
user
,
:master
]
sign_in
user
visit
project_path
(
project
)
end
it
'loads activity'
,
:js
do
expect
(
page
).
to
have_selector
(
'.event-item'
)
end
end
def
remove_with_confirm
(
button_text
,
confirm_with
)
def
remove_with_confirm
(
button_text
,
confirm_with
)
click_button
button_text
click_button
button_text
fill_in
'confirm_name_input'
,
with:
confirm_with
fill_in
'confirm_name_input'
,
with:
confirm_with
...
...
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