diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-02-02 23:13:03 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-02 23:13:03 +0100 |
| commit | 79efb9d0b2d08764ac1a7b0b8e3004c6da9236c1 (patch) | |
| tree | 8c9e31ecbc016aa59013583879b6328765b55153 /config/routes/group.rb | |
| parent | 648826721f13ee4309a11638e538d96006648b39 (diff) | |
| parent | a00aed74af67dd72a2aa7bf7e485ff7bdb949ea4 (diff) | |
| download | gitlab-ce-79efb9d0b2d08764ac1a7b0b8e3004c6da9236c1.tar.gz | |
Merge branch 'master' into persistent-callouts
Diffstat (limited to 'config/routes/group.rb')
| -rw-r--r-- | config/routes/group.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 976837a246d..24c76bc55ab 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -35,7 +35,7 @@ constraints(GroupUrlConstrainer.new) do post :toggle_subscription, on: :member end - resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do + resources :milestones, constraints: { id: %r{[^/]+} }, only: [:index, :show, :edit, :update, :new, :create] do member do get :merge_requests get :participants @@ -52,7 +52,7 @@ constraints(GroupUrlConstrainer.new) do resources :uploads, only: [:create] do collection do - get ":secret/:filename", action: :show, as: :show, constraints: { filename: /[^\/]+/ } + get ":secret/:filename", action: :show, as: :show, constraints: { filename: %r{[^/]+} } end end end |