Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 12 deletions

diff --git a/app/helpers/json_helper.rb b/app/helpers/json_helper.rb
index e61c789fd08..2a1a6272cc9 100644
--- a/app/helpers/json_helper.rb
+++ b/app/helpers/json_helper.rb
@@ -4,11 +4,11 @@ module JsonHelper
   # These two JSON helpers are short-form wrappers for the Gitlab::Json
   # class, which should be used in place of .to_json calls or calls to
   # the JSON class.
-  def json_generate(*args)
-    Gitlab::Json.generate(*args)
+  def json_generate(...)
+    Gitlab::Json.generate(...)
   end
 
-  def json_parse(*args)
-    Gitlab::Json.parse(*args)
+  def json_parse(...)
+    Gitlab::Json.parse(...)
   end
 end
diff --git a/app/helpers/routing/snippets_helper.rb b/app/helpers/routing/snippets_helper.rb
index 19450c1d033..a815204a216 100644
--- a/app/helpers/routing/snippets_helper.rb
+++ b/app/helpers/routing/snippets_helper.rb
@@ -114,16 +114,16 @@ module Routing
       end
     end
 
-    def toggle_award_emoji_personal_snippet_path(*args)
-      toggle_award_emoji_snippet_path(*args)
+    def toggle_award_emoji_personal_snippet_path(...)
+      toggle_award_emoji_snippet_path(...)
     end
 
-    def toggle_award_emoji_project_project_snippet_path(*args)
-      toggle_award_emoji_project_snippet_path(*args)
+    def toggle_award_emoji_project_project_snippet_path(...)
+      toggle_award_emoji_project_snippet_path(...)
     end
 
-    def toggle_award_emoji_project_project_snippet_url(*args)
-      toggle_award_emoji_project_snippet_url(*args)
+    def toggle_award_emoji_project_project_snippet_url(...)
+      toggle_award_emoji_project_snippet_url(...)
     end
 
     private
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 370dbb10462..0aeea323ddb 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -14,8 +14,8 @@ module TreeHelper
   end
 
   # Simple shortcut to File.join
-  def tree_join(*args)
-    File.join(*args)
+  def tree_join(...)
+    File.join(...)
   end
 
   def on_top_of_branch?(project = @project, ref = @ref)