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
667fa9af
Commit
667fa9af
authored
Apr 07, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Put back usernames in activity and profile feed
parent
6ca6ca89
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
4 deletions
+8
-4
_common.html.haml
app/views/events/event/_common.html.haml
+1
-0
_created_project.html.haml
app/views/events/event/_created_project.html.haml
+1
-0
_note.html.haml
app/views/events/event/_note.html.haml
+1
-0
_push.html.haml
app/views/events/event/_push.html.haml
+1
-0
project.rb
features/steps/shared/project.rb
+1
-1
project_member_activity_index_spec.rb
.../features/dashboard/project_member_activity_index_spec.rb
+3
-3
No files found.
app/views/events/event/_common.html.haml
View file @
667fa9af
...
...
@@ -10,6 +10,7 @@
=
custom_icon
(
"icon_code_fork"
)
.event-title
%span
.author_name
=
link_to_author
event
%span
{
class:
event
.
action_name
}
-
if
event
.
target
=
event
.
action_name
...
...
app/views/events/event/_created_project.html.haml
View file @
667fa9af
...
...
@@ -2,6 +2,7 @@
=
custom_icon
(
"icon_status_open"
)
.event-title
%span
.author_name
=
link_to_author
event
%span
{
class:
event
.
action_name
}
=
event_action_name
(
event
)
...
...
app/views/events/event/_note.html.haml
View file @
667fa9af
...
...
@@ -2,6 +2,7 @@
=
custom_icon
(
"icon_comment_o"
)
.event-title
%span
.author_name
=
link_to_author
event
=
event
.
action_name
=
event_note_title_html
(
event
)
...
...
app/views/events/event/_push.html.haml
View file @
667fa9af
...
...
@@ -7,6 +7,7 @@
=
custom_icon
(
"icon_commit"
)
.event-title
%span
.author_name
=
link_to_author
event
%span
.pushed
#{
event
.
action_name
}
#{
event
.
ref_type
}
%strong
-
commits_link
=
namespace_project_commits_path
(
project
.
namespace
,
project
,
event
.
ref_name
)
...
...
features/steps/shared/project.rb
View file @
667fa9af
...
...
@@ -97,7 +97,7 @@ module SharedProject
step
'I should see project "Shop" activity feed'
do
project
=
Project
.
find_by
(
name:
"Shop"
)
expect
(
page
).
to
have_content
"pushed new branch fix at
#{
project
.
name_with_namespace
}
"
expect
(
page
).
to
have_content
"
#{
@user
.
name
}
pushed new branch fix at
#{
project
.
name_with_namespace
}
"
end
step
'I should see project settings'
do
...
...
spec/features/dashboard/project_member_activity_index_spec.rb
View file @
667fa9af
...
...
@@ -21,20 +21,20 @@ feature 'Project member activity', feature: true, js: true do
context
'when a user joins the project'
do
before
{
visit_activities_and_wait_with_event
(
Event
::
JOINED
)
}
it
{
is_expected
.
to
eq
(
"joined project"
)
}
it
{
is_expected
.
to
eq
(
"
#{
user
.
name
}
joined project"
)
}
end
context
'when a user leaves the project'
do
before
{
visit_activities_and_wait_with_event
(
Event
::
LEFT
)
}
it
{
is_expected
.
to
eq
(
"left project"
)
}
it
{
is_expected
.
to
eq
(
"
#{
user
.
name
}
left project"
)
}
end
context
'when a users membership expires for the project'
do
before
{
visit_activities_and_wait_with_event
(
Event
::
EXPIRED
)
}
it
"presents the correct message"
do
message
=
"removed due to membership expiration from project"
message
=
"
#{
user
.
name
}
removed due to membership expiration from project"
is_expected
.
to
eq
(
message
)
end
end
...
...
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