diff options
| author | AlexDenisov <1101.debian@gmail.com> | 2013-01-09 05:58:27 +0000 |
|---|---|---|
| committer | Alex Denisov <1101.debian@gmail.com> | 2013-01-09 19:30:20 +0000 |
| commit | 0d9f73fa1e3d9f0c97b20b4bc85cd71b3df95df7 (patch) | |
| tree | ca1f243f4322fb7cb46733a7bbf3a0575089827e | |
| parent | f038057b9d75ce6ef8e6a2706152a23f045f91da (diff) | |
| download | gitlab-ce-0d9f73fa1e3d9f0c97b20b4bc85cd71b3df95df7.tar.gz | |
JavaScript removed from dashboard#index template.
| -rw-r--r-- | app/assets/javascripts/dashboard.js | 6 | ||||
| -rw-r--r-- | app/views/dashboard/index.html.haml | 3 | ||||
| -rw-r--r-- | features/dashboard/event_filters.feature | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js index 0261926af2b..11eead9771f 100644 --- a/app/assets/javascripts/dashboard.js +++ b/app/assets/javascripts/dashboard.js @@ -2,6 +2,12 @@ * Init dashboard page * */ + +$(function(){ + Pager.init(20, true); + dashboardPage(); +}); + function dashboardPage(){ $(".event_filter_link").bind('click',(function(){ enableFilter(this.id); diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml index 266d66aa6aa..abbe3101fc3 100644 --- a/app/views/dashboard/index.html.haml +++ b/app/views/dashboard/index.html.haml @@ -1,4 +1,3 @@ -= javascript_include_tag 'dashboard' - if @has_authorized_projects .projects .activities.span8 @@ -8,5 +7,3 @@ - else = render "zero_authorized_projects" -:javascript - $(function(){ Pager.init(20, true); }); diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature index 635bf40570d..e0c6b84b008 100644 --- a/features/dashboard/event_filters.feature +++ b/features/dashboard/event_filters.feature @@ -7,6 +7,7 @@ Feature: Event filters And this project has merge request event And I visit dashboard page + @javascript Scenario: I should see all events Then I should see push event And I should see new member event |