diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-04-23 12:16:46 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-04-23 12:16:46 +0000 |
| commit | 5939b18365c73401d5aeea25a83b935c6163bbf2 (patch) | |
| tree | 77cbf0a9725bb3a211690d12615b0811223d7f76 | |
| parent | 307b8c1c8d58c68018338cfae9c62a29080b6a5c (diff) | |
| parent | c7af058377b16cb899909eef7dcbd0ac913853ed (diff) | |
| download | gitlab-ci-5939b18365c73401d5aeea25a83b935c6163bbf2.tar.gz | |
Merge branch 'search_progressbar' into 'master'
Progressbar for projects search
https://dev.gitlab.org/gitlab/gitlab-ci/issues/214
See merge request !79
| -rw-r--r-- | app/views/projects/_gitlab.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/_search.html.haml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/_gitlab.html.haml b/app/views/projects/_gitlab.html.haml index 3dd759f..d21e200 100644 --- a/app/views/projects/_gitlab.html.haml +++ b/app/views/projects/_gitlab.html.haml @@ -56,5 +56,6 @@ %i.icon-angle-right :coffeescript + NProgress.done() $('.gitlab-projects-pagination').on 'ajax:before', -> $('.projects').html('<h1><i class="icon-spinner icon-spin"/></h1>') diff --git a/app/views/projects/_search.html.haml b/app/views/projects/_search.html.haml index ad428a5..1b350c7 100644 --- a/app/views/projects/_search.html.haml +++ b/app/views/projects/_search.html.haml @@ -11,4 +11,5 @@ $('.search .navbar-form').submit -> query = $('.search .navbar-form .search-input').val() $.get '#{gitlab_projects_path}' + '?search=' + query + NProgress.start() false
\ No newline at end of file |