diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-01 12:45:20 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-01 12:45:20 -0500 |
| commit | 3b489ad1d798d640d8d6cddd20d0ed10563d725b (patch) | |
| tree | ec22380e861f602109f7aff6d462c89074496ace | |
| parent | 2816a227ae9cbfc017a935988ff0ca1973726ae3 (diff) | |
| download | gitlab-ce-3b489ad1d798d640d8d6cddd20d0ed10563d725b.tar.gz | |
Rename attribute from url to href for consistency
| -rw-r--r-- | app/assets/javascripts/user_tabs.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/user_tabs.js.coffee b/app/assets/javascripts/user_tabs.js.coffee index dfde2383e5f..d2fa86d9f30 100644 --- a/app/assets/javascripts/user_tabs.js.coffee +++ b/app/assets/javascripts/user_tabs.js.coffee @@ -66,7 +66,7 @@ class @UserTabs return if @loaded['activity'] is true $calendarWrap = $('.user-calendar') - $calendarWrap.load($calendarWrap.data('url')) + $calendarWrap.load($calendarWrap.data('href')) new Activities() @loaded['activity'] = true diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 8b88b0ac606..dcee851c95d 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -88,7 +88,7 @@ #activity.tab-pane .gray-content-block.white.second-block %div{ class: container_class } - .user-calendar{data: {url: user_calendar_path}} + .user-calendar{data: {href: user_calendar_path}} %h4.center.light %i.fa.fa-spinner.fa-spin .user-calendar-activities |