summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-09-11 15:46:53 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-09-12 11:19:06 +0200
commitda0df236543beac96f845cacdfb9d77d69cc23cf (patch)
tree685167818185d5c45b8fd3455fa1747e465e92e3
parentcc5ccb74ec56934fd7956792af7cedef92791168 (diff)
downloadgitlab-ce-da0df236543beac96f845cacdfb9d77d69cc23cf.tar.gz
Implemented the new Description Content
-rw-r--r--app/serializers/build_details_entity.rb2
-rw-r--r--features/steps/project/redirects.rb1
-rw-r--r--spec/features/projects/jobs_spec.rb2
3 files changed, 2 insertions, 3 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index 1e90bef0778..8c89eea607f 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -33,7 +33,7 @@ class BuildDetailsEntity < JobEntity
def build_failed_issue_options
{ title: "Job Failed ##{build.id}",
- description: project_job_url(project, build) }
+ description: "Job [##{build.id}](#{project_job_path(project, build)}) failed for #{build.sha}:\n" }
end
def current_user
diff --git a/features/steps/project/redirects.rb b/features/steps/project/redirects.rb
index 9ce86ca45d0..ab6b464a405 100644
--- a/features/steps/project/redirects.rb
+++ b/features/steps/project/redirects.rb
@@ -17,7 +17,6 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
end
step 'I should see project "Community" home page' do
- Gitlab.config.gitlab.should_receive(:host).and_return("www.example.com")
page.within '.breadcrumbs .breadcrumb-item-text' do
expect(page).to have_content 'Community'
end
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 5d46b850e72..76630017b54 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -166,7 +166,7 @@ feature 'Jobs' do
it 'links to issues/new with the title and description filled in' do
button_title = "Job Failed ##{job.id}"
job_url = project_job_url(project, job)
- options = { issue: { title: button_title, description: job_url } }
+ options = { issue: { title: button_title, description: "Job [##{job.id}](#{ job_url}) failed for #{job.sha}:\n" } }
href = new_project_issue_path(project, options)