summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-11 01:03:03 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-11 01:03:03 -0700
commit9ae26cd128122936adf07e03aeecb221b5a72ecf (patch)
treee1807646bfeb5c4dc2c01913f1323e554292e898 /config/routes.rb
parent09572e40bc233792a9c8c528b373ba6dc4493791 (diff)
parentc830bab79a86d2397d1bd66c911e549377e396b4 (diff)
downloadgitlab-ce-9ae26cd128122936adf07e03aeecb221b5a72ecf.tar.gz
Merge pull request #4257 from jojosch/fix/routing-commit-with-#
Routing fix Commit-List: branch with # and + in name
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb
index a50f78c616b..6f72e2cb186 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