From d9833ed33719263c1bf1cd35caaf7ae38f62a8f9 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Thu, 16 Oct 2014 08:11:18 +0000 Subject: [PATCH 1/2] use ruby 2.1.3 for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 39e18c2f..0515500c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: -- 2.1.2 +- 2.1.3 bundler_args: "--without development production autotest" services: - mongodb From 1e2d9831050e3bf62b266af6def9b722f80d68fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcolas=20Iensen?= Date: Fri, 28 Nov 2014 10:42:09 -0200 Subject: [PATCH 2/2] Change route precedence of user_protips to come before slug_protips --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index fdcc8d7d..349e9451 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,6 +24,7 @@ resources :protips, :path => '/p' do collection do + get 'u/:username' => 'protips#user', as: :user get ':id/:slug' => 'protips#show', as: :slug, :constraints => {:slug => /(?!.*?edit).*/} get 'random' get 'search' => 'protips#search', as: :search @@ -34,7 +35,6 @@ get 'd/:date(/:start)' => 'protips#date', as: :date get 't/trending' => 'protips#trending', as: :trending_topics get 't/by_tags' => 'protips#by_tags', as: :by_tags - get 'u/:username' => 'protips#user', as: :user get 't/(/*tags)' => 'networks#tag', as: :tagged put 't/(/*tags)/subscribe' => 'protips#subscribe', as: :subscribe put 't/(/*tags)/unsubscribe' => 'protips#unsubscribe', as: :unsubscribe