From 37ff9d88ec0a9717900e05c26156f11f0e5ba5a5 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 9 Jun 2013 15:00:42 +0200 Subject: Routing fix Commit-List: switch to branch with # in name --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/routes.rb') diff --git a/config/routes.rb b/config/routes.rb index c555cd0b361..1889461b68d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -251,11 +251,11 @@ Gitlab::Application.routes.draw do member do # tree viewer logs - get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } + get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-#%]+/ } get "logs_tree/:path" => "refs#logs_tree", as: :logs_file, constraints: { - id: /[a-zA-Z.0-9\/_\-]+/, + id: /[a-zA-Z.0-9\/_\-#%]+/, path: /.*/ } end -- cgit v1.2.1 From c830bab79a86d2397d1bd66c911e549377e396b4 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 9 Jun 2013 23:47:55 +0200 Subject: Commit List and Tree allow also + in branch name --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/routes.rb') diff --git a/config/routes.rb b/config/routes.rb index 1889461b68d..492a93b33bc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -251,11 +251,11 @@ Gitlab::Application.routes.draw do member do # tree viewer logs - get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-#%]+/ } + get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ } get "logs_tree/:path" => "refs#logs_tree", as: :logs_file, constraints: { - id: /[a-zA-Z.0-9\/_\-#%]+/, + id: /[a-zA-Z.0-9\/_\-#%+]+/, path: /.*/ } end -- cgit v1.2.1