mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-10 21:26:07 +10:00
Rémy CoutableandRobert Speicher
1b85f5572a
Fix snippets comments not displayed
## What does this MR do?
Fix an issue where comments body were not displayed for project snippets anymore (see commit for details).
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
Because of #19388.
## What are the relevant issue numbers?
Fixes #19388.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5045
(cherry picked from commit b227355973)
104 lines
2.8 KiB
Ruby
104 lines
2.8 KiB
Ruby
class Projects::SnippetsController < Projects::ApplicationController
|
|
before_action :module_enabled
|
|
before_action :snippet, only: [:show, :edit, :destroy, :update, :raw]
|
|
|
|
# Allow read any snippet
|
|
before_action :authorize_read_project_snippet!, except: [:new, :create, :index]
|
|
|
|
# Allow write(create) snippet
|
|
before_action :authorize_create_project_snippet!, only: [:new, :create]
|
|
|
|
# Allow modify snippet
|
|
before_action :authorize_update_project_snippet!, only: [:edit, :update]
|
|
|
|
# Allow destroy snippet
|
|
before_action :authorize_admin_project_snippet!, only: [:destroy]
|
|
|
|
respond_to :html
|
|
|
|
def index
|
|
@snippets = SnippetsFinder.new.execute(current_user, {
|
|
filter: :by_project,
|
|
project: @project
|
|
})
|
|
@snippets = @snippets.page(params[:page])
|
|
end
|
|
|
|
def new
|
|
@snippet = @noteable = @project.snippets.build
|
|
end
|
|
|
|
def create
|
|
@snippet = CreateSnippetService.new(@project, current_user,
|
|
snippet_params).execute
|
|
|
|
if @snippet.valid?
|
|
respond_with(@snippet,
|
|
location: namespace_project_snippet_path(@project.namespace,
|
|
@project, @snippet))
|
|
else
|
|
render :new
|
|
end
|
|
end
|
|
|
|
def edit
|
|
end
|
|
|
|
def update
|
|
UpdateSnippetService.new(project, current_user, @snippet,
|
|
snippet_params).execute
|
|
respond_with(@snippet,
|
|
location: namespace_project_snippet_path(@project.namespace,
|
|
@project, @snippet))
|
|
end
|
|
|
|
def show
|
|
@note = @project.notes.new(noteable: @snippet)
|
|
@notes = Banzai::NoteRenderer.render(@snippet.notes.fresh, @project, current_user)
|
|
@noteable = @snippet
|
|
end
|
|
|
|
def destroy
|
|
return access_denied! unless can?(current_user, :admin_project_snippet, @snippet)
|
|
|
|
@snippet.destroy
|
|
|
|
redirect_to namespace_project_snippets_path(@project.namespace, @project)
|
|
end
|
|
|
|
def raw
|
|
send_data(
|
|
@snippet.content,
|
|
type: 'text/plain; charset=utf-8',
|
|
disposition: 'inline',
|
|
filename: @snippet.sanitized_file_name
|
|
)
|
|
end
|
|
|
|
protected
|
|
|
|
def snippet
|
|
@snippet ||= @project.snippets.find(params[:id])
|
|
end
|
|
|
|
def authorize_read_project_snippet!
|
|
return render_404 unless can?(current_user, :read_project_snippet, @snippet)
|
|
end
|
|
|
|
def authorize_update_project_snippet!
|
|
return render_404 unless can?(current_user, :update_project_snippet, @snippet)
|
|
end
|
|
|
|
def authorize_admin_project_snippet!
|
|
return render_404 unless can?(current_user, :admin_project_snippet, @snippet)
|
|
end
|
|
|
|
def module_enabled
|
|
return render_404 unless @project.snippets_enabled
|
|
end
|
|
|
|
def snippet_params
|
|
params.require(:project_snippet).permit(:title, :content, :file_name, :private, :visibility_level)
|
|
end
|
|
end
|