From 938a1381fc89d39df9c440aad2f95e3b93d80f3b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 20 Feb 2015 14:39:35 +0100
Subject: [PATCH] Satisfy Rubocop.
---
app/controllers/projects/uploads_controller.rb | 2 +-
config/initializers/static_files.rb | 2 +-
config/routes.rb | 10 ++++++----
lib/gitlab/middleware/static.rb | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
index b922b56418a..2b4da35bc7f 100644
--- a/app/controllers/projects/uploads_controller.rb
+++ b/app/controllers/projects/uploads_controller.rb
@@ -16,4 +16,4 @@ class Projects::UploadsController < Projects::ApplicationController
not_found!
end
end
-end
\ No newline at end of file
+end
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
#
diff --git a/lib/gitlab/middleware/static.rb b/lib/gitlab/middleware/static.rb
index b92319c95d4..85ffa8aca68 100644
--- a/lib/gitlab/middleware/static.rb
+++ b/lib/gitlab/middleware/static.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
end
-end
\ No newline at end of file
+end
--
GitLab