summaryrefslogtreecommitdiff
path: root/app/views/users
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-02-16 16:02:40 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-02-23 15:47:23 -0600
commit103f5a116b1ae6ecbef69d6903b26f7259f090cb (patch)
tree0e3d762be03e421a0f07a96c8ad94dc333724f89 /app/views/users
parent4802bd512a2492c7560acde077fee2f4cd9483b3 (diff)
downloadgitlab-ce-103f5a116b1ae6ecbef69d6903b26f7259f090cb.tar.gz
Created unit tests, fixtures and integration tests
Also changed the user_callout haml to a partial and added the corresponding SVG icon
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/show.html.haml16
1 files changed, 3 insertions, 13 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index a3e35961261..bee65875a99 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -98,19 +98,9 @@
Snippets
%div{ class: container_class }
- #user-callout
- .bordered-box.landing.content-block
- = icon("times", class: "dismiss-icon")
- .row
- .col-sm-3.col-xs-12.svg-container
- = custom_icon('icon_cycle_analytics_splash')
- .col-sm-8.col-xs-12.inner-content
- %h4
- Customize your experience
- %p
- Change syntax themes, default project pages, and more in preferences.
-
- = link_to "Check it out", profile_preferences_path, class: 'btn'
+ = render partial: 'shared/user_callout'
+ %div{ class: container_class }
+ .tab-content
#activity.tab-pane
.row-content-block.calender-block.white.second-block.hidden-xs
.user-calendar{ data: { href: user_calendar_path } }