summaryrefslogtreecommitdiff
path: root/app/helpers/builds_helper.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-07-06 12:43:51 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-07-06 12:43:51 -0400
commiteef068754af7437baf327c5cb4e2b454ba40a617 (patch)
tree3583327140b2994432de317b4ac06d66b274b430 /app/helpers/builds_helper.rb
parent9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed (diff)
parent9274c3c1598f3ff32339e681d5812feeb0f62605 (diff)
downloadgitlab-ce-eef068754af7437baf327c5cb4e2b454ba40a617.tar.gz
Merge branch 'master' into rs-sign_in
Diffstat (limited to 'app/helpers/builds_helper.rb')
-rw-r--r--app/helpers/builds_helper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb
index f0a0d245dc0..85bc784d53c 100644
--- a/app/helpers/builds_helper.rb
+++ b/app/helpers/builds_helper.rb
@@ -20,8 +20,8 @@ module BuildsHelper
def javascript_build_options
{
- page_url: namespace_project_job_url(@project.namespace, @project, @build),
- build_url: namespace_project_job_url(@project.namespace, @project, @build, :json),
+ page_url: project_job_url(@project, @build),
+ build_url: project_job_url(@project, @build, :json),
build_status: @build.status,
build_stage: @build.stage,
log_state: ''
@@ -31,7 +31,7 @@ module BuildsHelper
def build_failed_issue_options
{
title: "Build Failed ##{@build.id}",
- description: namespace_project_job_url(@project.namespace, @project, @build)
+ description: project_job_url(@project, @build)
}
end
end