diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-22 15:05:52 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-22 15:05:52 +0200 |
| commit | 97c42df3b804a37e659c3cda6bd8a52570f31366 (patch) | |
| tree | 97c38db7f71a93a7b0db5ca2c682d6d17479cbdb /app/controllers/projects/snippets_controller.rb | |
| parent | 3833f1dd84dfec844443a5b1d9ba2bd2b911c0bc (diff) | |
| parent | 11716f310dcc495600f5a17e08456a1abb296482 (diff) | |
| download | gitlab-ce-97c42df3b804a37e659c3cda6bd8a52570f31366.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch28717-additional-metrics-review-branch
Diffstat (limited to 'app/controllers/projects/snippets_controller.rb')
| -rw-r--r-- | app/controllers/projects/snippets_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index 8a8f8d6a27d..98dd307bd9d 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -5,7 +5,7 @@ class Projects::SnippetsController < Projects::ApplicationController include SnippetsActions include RendersBlob - before_action :module_enabled + before_action :check_snippets_available! before_action :snippet, only: [:show, :edit, :destroy, :update, :raw, :toggle_award_emoji, :mark_as_spam] # Allow read any snippet @@ -102,10 +102,6 @@ class Projects::SnippetsController < Projects::ApplicationController return render_404 unless can?(current_user, :admin_project_snippet, @snippet) end - def module_enabled - return render_404 unless @project.feature_available?(:snippets, current_user) - end - def snippet_params params.require(:project_snippet).permit(:title, :content, :file_name, :private, :visibility_level, :description) end |