Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
89a06a4f4a11
Commit
667fa9af
authored
Apr 07, 2017
by
Annabel Dunstone Gray
Browse files
Put back usernames in activity and profile feed
parent
631e2c0a6d4d
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/views/events/event/_common.html.haml
View file @
89a06a4f
...
...
@@ -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 @
89a06a4f
...
...
@@ -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 @
89a06a4f
...
...
@@ -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 @
89a06a4f
...
...
@@ -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 @
89a06a4f
...
...
@@ -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 @
89a06a4f
...
...
@@ -21,20 +21,20 @@ def visit_activities_and_wait_with_event(event_type)
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