Resolve lib/api/helpers/internal_helpers.rb

d68babd4 · Valery Sizov · 687a6c08 · d68babd4
Commit d68babd4 authored Apr 11, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

lib/api/helpers/internal_helpers.rb lib/api/helpers/internal_helpers.rb +0 -6

No files found.
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -53,7 +53,6 @@ module API
        ]
      end

-<<<<<<< HEAD
      def log_user_activity(actor)
        commands = Gitlab::GitAccess::DOWNLOAD_COMMANDS

@@ -63,11 +62,6 @@ module API
      def parse_env
        return {} if params[:env].blank?

-=======
-      def parse_env
-        return {} if params[:env].blank?
-
->>>>>>> 19dd138cdd4e551759a2163f5357ae2fc9f73b99
        JSON.parse(params[:env])
      rescue JSON::ParserError
        {}