Merge branch 'master' into remove-forks-from-projects-settings

1 files changed, 8 insertions, 2 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 64bdd189f53..f6812c9280a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -544,8 +544,10 @@ Gitlab::Application.routes.draw do
           member do
             # tree viewer logs
             get 'logs_tree', constraints: { id: Gitlab::Regex.git_reference_regex }
+            # Directories with leading dots erroneously get rejected if git
+            # ref regex used in constraints. Regex verification now done in controller.
             get 'logs_tree/*path' => 'refs#logs_tree', as: :logs_file, constraints: {
-              id: Gitlab::Regex.git_reference_regex,
+              id: /.*/,
               path: /.*/
             }
           end
@@ -586,7 +588,11 @@ Gitlab::Application.routes.draw do
           end
         end
 
-        resources :builds, only: [:show] do
+        resources :builds, only: [:index, :show] do
+          collection do
+            get :cancel_all
+          end
+
           member do
             get :cancel
             get :status