Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 12 deletions

diff --git a/app/controllers/groups/settings/applications_controller.rb b/app/controllers/groups/settings/applications_controller.rb
index b174ba9a6ad..2bf5c95937b 100644
--- a/app/controllers/groups/settings/applications_controller.rb
+++ b/app/controllers/groups/settings/applications_controller.rb
@@ -15,9 +15,7 @@ module Groups
         set_index_vars
       end
 
-      def show
-        @created = get_created_session if Feature.disabled?('hash_oauth_secrets')
-      end
+      def show; end
 
       def edit
       end
@@ -28,15 +26,8 @@ module Groups
         if @application.persisted?
           flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
 
-          if Feature.enabled?('hash_oauth_secrets')
-
-            @created = true
-            render :show
-          else
-            set_created_session
-
-            redirect_to group_settings_application_url(@group, @application)
-          end
+          @created = true
+          render :show
         else
           set_index_vars
           render :index