summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-03 22:04:37 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-03 22:04:37 +0100
commitff2713a57046bd08764ad391d7f34bd27f787610 (patch)
tree89545571971411a3aa9a7deea61f08c2d9be0967 /app/controllers/projects
parent3c91841d032f02b0b0d4c532998bbc923247e804 (diff)
downloadgitlab-ce-ff2713a57046bd08764ad391d7f34bd27f787610.tar.gz
Fix typos in ProtectedRef concern and whitespace detected by rubocop
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/protected_branches_controller.rb1
-rw-r--r--app/controllers/projects/protected_tags_controller.rb1
-rw-r--r--app/controllers/projects/settings/repository_controller.rb1
3 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index a245a60910e..c2a55c9500a 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -1,5 +1,4 @@
class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
-
protected
def protected_ref
diff --git a/app/controllers/projects/protected_tags_controller.rb b/app/controllers/projects/protected_tags_controller.rb
index 8f407b42ac8..ff132056aa4 100644
--- a/app/controllers/projects/protected_tags_controller.rb
+++ b/app/controllers/projects/protected_tags_controller.rb
@@ -1,5 +1,4 @@
class Projects::ProtectedTagsController < Projects::ProtectedRefsController
-
protected
def protected_ref
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index fb175b4a636..ff818d9e51a 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -19,7 +19,6 @@ module Projects
load_gon_index
end
-
def access_levels_options
#TODO: consider protected tags
#TODO: Refactor ProtectedBranch::PushAccessLevel so it doesn't mention branches