diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-20 14:39:35 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-20 16:04:03 +0100 |
| commit | 938a1381fc89d39df9c440aad2f95e3b93d80f3b (patch) | |
| tree | a9e3694f580fd122c07ca0e62c36ff6482436bae /config | |
| parent | 73d12d6e6db807d6d15a665cddc0ca9a47bff4eb (diff) | |
| download | gitlab-ce-938a1381fc89d39df9c440aad2f95e3b93d80f3b.tar.gz | |
Satisfy Rubocop.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/static_files.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb index e04c29cee4a..2a6eaec0cc4 100644 --- a/config/initializers/static_files.rb +++ b/config/initializers/static_files.rb @@ -10,4 +10,4 @@ begin rescue # If ActionDispatch::Static wasn't loaded onto the stack (like in production), # an exception is raised. -end
\ No newline at end of file +end diff --git a/config/routes.rb b/config/routes.rb index 0e7f7d893d4..a2ae2f8da04 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -75,12 +75,14 @@ Gitlab::Application.routes.draw do scope path: :uploads do # Note attachments and User/Group/Project avatars - get ":model/:mounted_as/:id/:filename", to: "uploads#show", - constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /.+/ } + get ":model/:mounted_as/:id/:filename", + to: "uploads#show", + constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /.+/ } # Project markdown uploads - get ":id/:secret/:filename", to: "projects/uploads#show", - constraints: { id: /[a-zA-Z.0-9_\-]+\/[a-zA-Z.0-9_\-]+/, filename: /.+/ } + get ":id/:secret/:filename", + to: "projects/uploads#show", + constraints: { id: /[a-zA-Z.0-9_\-]+\/[a-zA-Z.0-9_\-]+/, filename: /.+/ } end # |