summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-15 14:42:03 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-15 14:42:03 -0800
commit11591573e117b0b8f3fcd6f86c526e2df20a0dbf (patch)
tree0269b2ca2959a3983e70d91655189d29d13709ec
parentdbd54fad513f65befd364a25047a64f168ec8e0e (diff)
parent6c65b91d8c754c61fe8e50966283af5f78c1c9f0 (diff)
downloadgitlab-ce-11591573e117b0b8f3fcd6f86c526e2df20a0dbf.tar.gz
Merge pull request #7925 from cirosantilli/unused-arguments
Remove or prepend underscore _ to unused method arguments
-rw-r--r--app/controllers/registrations_controller.rb4
-rw-r--r--app/helpers/tree_helper.rb2
-rw-r--r--app/views/projects/tree/_tree.html.haml2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 52db44bf822..97aa2d9bdb4 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -15,11 +15,11 @@ class RegistrationsController < Devise::RegistrationsController
super
end
- def after_sign_up_path_for(resource)
+ def after_sign_up_path_for(_resource)
new_user_session_path
end
- def after_inactive_sign_up_path_for(resource)
+ def after_inactive_sign_up_path_for(_resource)
new_user_session_path
end
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 5a96a208e93..d316213b1fd 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -108,7 +108,7 @@ module TreeHelper
end
end
- def up_dir_path(tree)
+ def up_dir_path
file = File.join(@path, "..")
tree_join(@ref, file)
end
diff --git a/app/views/projects/tree/_tree.html.haml b/app/views/projects/tree/_tree.html.haml
index 1159fcadffd..68ccd4d61bb 100644
--- a/app/views/projects/tree/_tree.html.haml
+++ b/app/views/projects/tree/_tree.html.haml
@@ -35,7 +35,7 @@
- if @path.present?
%tr.tree-item
%td.tree-item-file-name
- = link_to "..", project_tree_path(@project, up_dir_path(tree)), class: 'prepend-left-10'
+ = link_to "..", project_tree_path(@project, up_dir_path), class: 'prepend-left-10'
%td
%td.hidden-xs