diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-02 15:28:22 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-02 15:28:22 -0800 |
| commit | 519ca7bae9b4f929ae135c5b097dd2d329d8f7de (patch) | |
| tree | 3f96febab61d1fb851427d59b3244dd300237f88 /app/views/explore | |
| parent | 33e107127a4c37cefaf24c0f5dd335e782594da3 (diff) | |
| parent | 55d980905540bae6d02ac104dac5c23e96dd5711 (diff) | |
| download | gitlab-ce-519ca7bae9b4f929ae135c5b097dd2d329d8f7de.tar.gz | |
Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button
Conflicts:
app/views/shared/_issuable_filter.html.haml
Diffstat (limited to 'app/views/explore')
| -rw-r--r-- | app/views/explore/groups/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/explore/projects/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml index 5cf514927af..2ea6cb18655 100644 --- a/app/views/explore/groups/index.html.haml +++ b/app/views/explore/groups/index.html.haml @@ -9,7 +9,7 @@ .pull-right .dropdown.inline - %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} + %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'} %span.light sort: - if @sort.present? = sort_options_hash[@sort] diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml index 02d02912791..cb93b300d6a 100644 --- a/app/views/explore/projects/index.html.haml +++ b/app/views/explore/projects/index.html.haml @@ -8,7 +8,7 @@ .pull-right .dropdown.inline - %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} + %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'} %span.light sort: - if @sort.present? = sort_options_hash[@sort] |