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
f9f04244
Commit
f9f04244
authored
May 31, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'user-callout-dismissed-method-rename' into 'master'
Fixed the show_user_callout method See merge request !11689
parents
2281589c
a2c85942
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
application_helper.rb
app/helpers/application_helper.rb
+1
-1
index.html.haml
app/views/dashboard/projects/index.html.haml
+1
-1
show.html.haml
app/views/users/show.html.haml
+1
-1
No files found.
app/helpers/application_helper.rb
View file @
f9f04244
...
...
@@ -276,7 +276,7 @@ module ApplicationHelper
end
def
show_user_callout?
cookies
[
:user_callout_dismissed
]
==
'true'
cookies
[
:user_callout_dismissed
]
.
nil?
end
def
linkedin_url
(
user
)
...
...
app/views/dashboard/projects/index.html.haml
View file @
f9f04244
...
...
@@ -9,7 +9,7 @@
=
render
"projects/last_push"
%div
{
class:
container_class
}
-
unless
show_user_callout?
-
if
show_user_callout?
=
render
'shared/user_callout'
-
if
@projects
.
any?
||
params
[
:name
]
...
...
app/views/users/show.html.haml
View file @
f9f04244
...
...
@@ -100,7 +100,7 @@
Snippets
%div
{
class:
container_class
}
-
if
@user
==
current_user
&&
!
show_user_callout?
-
if
@user
==
current_user
&&
show_user_callout?
=
render
'shared/user_callout'
.tab-content
#activity
.tab-pane
...
...
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