Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
29e5ae8c
Commit
29e5ae8c
authored
Mar 23, 2017
by
Jose Ivan Vargas Lopez
Committed by
Alfredo Sumaran
Mar 23, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix usercallout to only show on the current logged in user profile
parent
6eeba4b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
app/views/users/show.html.haml
app/views/users/show.html.haml
+2
-1
changelogs/unreleased/user-callout-showing-on-all-profiles.yml
...elogs/unreleased/user-callout-showing-on-all-profiles.yml
+4
-0
spec/features/user_callout_spec.rb
spec/features/user_callout_spec.rb
+7
-1
No files found.
app/views/users/show.html.haml
View file @
29e5ae8c
...
@@ -97,7 +97,8 @@
...
@@ -97,7 +97,8 @@
Snippets
Snippets
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.user-callout
{
'callout-svg'
=>
custom_icon
(
'icon_customization'
)
}
-
if
@user
==
current_user
.user-callout
{
'callout-svg'
=>
custom_icon
(
'icon_customization'
)
}
.tab-content
.tab-content
#activity
.tab-pane
#activity
.tab-pane
.row-content-block.calender-block.white.second-block.hidden-xs
.row-content-block.calender-block.white.second-block.hidden-xs
...
...
changelogs/unreleased/user-callout-showing-on-all-profiles.yml
0 → 100644
View file @
29e5ae8c
---
title
:
User callout only shows on current users profile
merge_request
:
author
:
spec/features/user_callout_spec.rb
View file @
29e5ae8c
...
@@ -2,6 +2,7 @@ require 'spec_helper'
...
@@ -2,6 +2,7 @@ require 'spec_helper'
describe
'User Callouts'
,
js:
true
do
describe
'User Callouts'
,
js:
true
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:another_user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:empty_project
,
path:
'gitlab'
,
name:
'sample'
)
}
let
(
:project
)
{
create
(
:empty_project
,
path:
'gitlab'
,
name:
'sample'
)
}
before
do
before
do
...
@@ -32,6 +33,11 @@ describe 'User Callouts', js: true do
...
@@ -32,6 +33,11 @@ describe 'User Callouts', js: true do
within
(
'.user-callout'
)
do
within
(
'.user-callout'
)
do
find
(
'.close-user-callout'
).
click
find
(
'.close-user-callout'
).
click
end
end
expect
(
page
).
not_to
have_selector
(
'#user-callout'
)
expect
(
page
).
not_to
have_selector
(
'.user-callout'
)
end
it
'does not show callout on another users profile'
do
visit
user_path
(
another_user
)
expect
(
page
).
not_to
have_selector
(
'.user-callout'
)
end
end
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