Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 17 deletions

diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index 49840e847f2..779e149bb9c 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -7,12 +7,11 @@ class Projects::SnippetsController < Projects::Snippets::ApplicationController
 
   before_action :check_snippets_available!
 
-  before_action :snippet, only: [:show, :edit, :destroy, :update, :raw, :toggle_award_emoji, :mark_as_spam]
+  before_action :snippet, only: [:show, :edit, :raw, :toggle_award_emoji, :mark_as_spam]
 
-  before_action :authorize_create_snippet!, only: [:new, :create]
-  before_action :authorize_read_snippet!, except: [:new, :create, :index]
-  before_action :authorize_update_snippet!, only: [:edit, :update]
-  before_action :authorize_admin_snippet!, only: [:destroy]
+  before_action :authorize_create_snippet!, only: :new
+  before_action :authorize_read_snippet!, except: [:new, :index]
+  before_action :authorize_update_snippet!, only: :edit
 
   def index
     @snippet_counts = ::Snippets::CountService
@@ -33,14 +32,6 @@ class Projects::SnippetsController < Projects::Snippets::ApplicationController
     @snippet = @noteable = @project.snippets.build
   end
 
-  def create
-    create_params = snippet_params.merge(spammable_params)
-    service_response = ::Snippets::CreateService.new(project, current_user, create_params).execute
-    @snippet = service_response.payload[:snippet]
-
-    handle_repository_error(:new)
-  end
-
   protected
 
   alias_method :awardable, :snippet
@@ -49,8 +40,4 @@ class Projects::SnippetsController < Projects::Snippets::ApplicationController
   def spammable_path
     project_snippet_path(@project, @snippet)
   end
-
-  def snippet_params
-    params.require(:project_snippet).permit(:title, :content, :file_name, :private, :visibility_level, :description)
-  end
 end