From fdd0b0fd4592c74257980d07878db75705d22192 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 23 Apr 2020 18:09:46 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/api/helpers/snippets_helpers.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/api/helpers/snippets_helpers.rb')

diff --git a/lib/api/helpers/snippets_helpers.rb b/lib/api/helpers/snippets_helpers.rb
index 6ca3086d934..20aeca6a9d3 100644
--- a/lib/api/helpers/snippets_helpers.rb
+++ b/lib/api/helpers/snippets_helpers.rb
@@ -4,12 +4,12 @@ module API
   module Helpers
     module SnippetsHelpers
       def content_for(snippet)
-        if ::Feature.enabled?(:version_snippets, current_user) && !snippet.empty_repo?
+        if snippet.empty_repo?
+          snippet.content
+        else
           blob = snippet.blobs.first
           blob.load_all_data!
           blob.data
-        else
-          snippet.content
         end
       end
     end
-- 
cgit v1.2.1