diff options
| author | Rydkin Maxim <maks.rydkin@gmail.com> | 2017-04-04 22:21:12 +0300 |
|---|---|---|
| committer | Rydkin Maxim <maks.rydkin@gmail.com> | 2017-04-04 22:21:12 +0300 |
| commit | 2d4fd769a7a53f6f8ac1cd0331a8eb6b625dc8b6 (patch) | |
| tree | 385813dd266d05ecd2b01be9364be2c902623512 /app | |
| parent | c9806b47b868ca5fe424476077262edc1d64cac0 (diff) | |
| download | gitlab-ce-2d4fd769a7a53f6f8ac1cd0331a8eb6b625dc8b6.tar.gz | |
replaced one more helper with presenter
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 43a1abaa662..0da0420185d 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -114,7 +114,7 @@ class Projects::PipelinesController < Projects::ApplicationController end def pipeline - @pipeline ||= project.pipelines.find_by!(id: params[:id]) + @pipeline ||= project.pipelines.find_by!(id: params[:id]).present(current_user: current_user) end def commit diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 17f38cef718..c9d83d23d56 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -1,6 +1,6 @@ .page-content-header .header-main-content - = render 'ci/status/badge', status: @pipeline.detailed_status(current_user), title: status_title(@pipeline) + = render 'ci/status/badge', status: @pipeline.detailed_status(current_user), title: @pipeline.status_title %strong Pipeline ##{@pipeline.id} triggered #{time_ago_with_tooltip(@pipeline.created_at)} - if @pipeline.user |