diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-20 15:19:32 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-20 15:19:32 +0300 |
| commit | 8819007c83fdf1ac642836640a37cc541f6eddc6 (patch) | |
| tree | 3a70e37e033ed1b58af4d64b0e1381a2feefd5ab /app/helpers | |
| parent | eb057209b072e9557f41c6f062832f9b37f62fc8 (diff) | |
| parent | 90071a08d77069410e64b7cfe926eb806fd70504 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/explore_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/tab_helper.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb index 7616fe6bad8..0d291f9a87e 100644 --- a/app/helpers/explore_helper.rb +++ b/app/helpers/explore_helper.rb @@ -10,7 +10,7 @@ module ExploreHelper options = exist_opts.merge(options) - path = request.path + path = explore_projects_path path << "?#{options.to_param}" path end diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb index 77727337f07..0e7d8065ac7 100644 --- a/app/helpers/tab_helper.rb +++ b/app/helpers/tab_helper.rb @@ -67,6 +67,14 @@ module TabHelper path.any? do |single_path| current_path?(single_path) end + elsif page = options.delete(:page) + unless page.respond_to?(:each) + page = [page] + end + + page.any? do |single_page| + current_page?(single_page) + end else c = options.delete(:controller) a = options.delete(:action) |