From 7acbf797d138224588d335744d48ec9f62e85cf8 Mon Sep 17 00:00:00 2001 From: Luiz Gustavo Nogara Date: Thu, 29 Nov 2012 16:00:21 -0200 Subject: [PATCH 1/3] Fixes web ui error String.blank? not necessarily available when using this gem --- web/views/_nav.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/views/_nav.slim b/web/views/_nav.slim index ca870c21..8b3d1b1b 100755 --- a/web/views/_nav.slim +++ b/web/views/_nav.slim @@ -9,7 +9,7 @@ div.nav-collapse ul.nav - tabs.each do |title, url| - - if url.blank? + - if url !~ /[^[:space:]]/ li class="#{(current_path == url) ? 'active':''}" a href='#{{root_path}}#{{url}}' #{title} - else From f3c387175aa9c3fbc02caf28fb7cbb641309a7e5 Mon Sep 17 00:00:00 2001 From: Luiz Gustavo Nogara Date: Thu, 29 Nov 2012 17:44:17 -0200 Subject: [PATCH 2/3] Simplifies check for the url --- web/views/_nav.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/views/_nav.slim b/web/views/_nav.slim index 8b3d1b1b..43d650f8 100755 --- a/web/views/_nav.slim +++ b/web/views/_nav.slim @@ -9,7 +9,7 @@ div.nav-collapse ul.nav - tabs.each do |title, url| - - if url !~ /[^[:space:]]/ + - if url != '' li class="#{(current_path == url) ? 'active':''}" a href='#{{root_path}}#{{url}}' #{title} - else From 56ec442bbceff6eb17fed98e6f41bdd902eb301d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trung=20L=C3=AA?= Date: Fri, 30 Nov 2012 12:13:46 +1100 Subject: [PATCH 3/3] Test against ruby-2.0.0 Here we go again, this time, it's real. Travis now has bumped their worker VM with RVM that supports 2.0. Give it a try? --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6a8d2a05..cee97f4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 1.9.3 - jruby-19mode - rbx-19mode + - 2.0 branches: only: - master @@ -15,3 +16,4 @@ matrix: allow_failures: - rvm: jruby-19mode - rvm: rbx-19mode + - rvm: 2.0