Skip to content

G
gitlab-ce
Commit 241309d6 authored by GitLab Bot's avatar GitLab Bot
Browse files
Options

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-05 

# Conflicts:
#	locale/gitlab.pot

[ci skip]
parents 2c84eb5c 166b4575
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 17 deletions
app/assets/javascripts/jobs/components/sidebar_details_block.vue
View file @ 241309d6
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
return `#${this.job.runner.id}`; return `#${this.job.runner.id}`;
}, },
hasTimeout() { hasTimeout() {
return this.job.metadata != null && this.job.metadata.timeout_human_readable !== ''; return this.job.metadata != null && this.job.metadata.timeout_human_readable !== null;
}, },
timeout() { timeout() {
if (this.job.metadata == null) { if (this.job.metadata == null) {
......
app/models/ci/build.rb
View file @ 241309d6
...@@ -94,6 +94,7 @@ module Ci ...@@ -94,6 +94,7 @@ module Ci
before_save :ensure_token before_save :ensure_token
before_destroy { unscoped_project } before_destroy { unscoped_project }
before_create :ensure_metadata
after_create unless: :importing? do |build| after_create unless: :importing? do |build|
run_after_commit { BuildHooksWorker.perform_async(build.id) } run_after_commit { BuildHooksWorker.perform_async(build.id) }
end end
......
app/serializers/build_metadata_entity.rb
View file @ 241309d6
class BuildMetadataEntity < Grape::Entity class BuildMetadataEntity < Grape::Entity
expose :timeout_human_readable do |metadata| expose :timeout_human_readable
metadata.timeout_human_readable unless metadata.timeout.nil?
end
expose :timeout_source do |metadata| expose :timeout_source do |metadata|
metadata.present.timeout_source metadata.present.timeout_source
end end
......
locale/gitlab.pot
View file @ 241309d6
...@@ -8,8 +8,13 @@ msgid "" ...@@ -8,8 +8,13 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2018-04-04 19:35+0200\n" "POT-Creation-Date: 2018-04-04 19:35+0200\n"
"PO-Revision-Date: 2018-04-04 19:35+0200\n" "PO-Revision-Date: 2018-04-04 19:35+0200\n"
=======
"POT-Creation-Date: 2018-04-04 18:02+0200\n"
"PO-Revision-Date: 2018-04-04 18:02+0200\n"
>>>>>>> upstream/master
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -256,9 +261,12 @@ msgstr "" ...@@ -256,9 +261,12 @@ msgstr ""
msgid "Allow edits from maintainers." msgid "Allow edits from maintainers."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Allow rendering of PlantUML diagrams in Asciidoc documents." msgid "Allow rendering of PlantUML diagrams in Asciidoc documents."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Allow requests to the local network from hooks and services." msgid "Allow requests to the local network from hooks and services."
msgstr "" msgstr ""
...@@ -484,9 +492,12 @@ msgstr "" ...@@ -484,9 +492,12 @@ msgstr ""
msgid "Average per day: %{average}" msgid "Average per day: %{average}"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Background Color" msgid "Background Color"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Background jobs" msgid "Background jobs"
msgstr "" msgstr ""
...@@ -1330,9 +1341,12 @@ msgstr "" ...@@ -1330,9 +1341,12 @@ msgstr ""
msgid "Confidentiality" msgid "Confidentiality"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Configure Gitaly timeouts." msgid "Configure Gitaly timeouts."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Configure Sidekiq job throttling." msgid "Configure Sidekiq job throttling."
msgstr "" msgstr ""
...@@ -1710,9 +1724,12 @@ msgstr "" ...@@ -1710,9 +1724,12 @@ msgstr ""
msgid "Enable Auto DevOps" msgid "Enable Auto DevOps"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Enable SAML authentication for this group" msgid "Enable SAML authentication for this group"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Enable Sentry for error reporting and logging." msgid "Enable Sentry for error reporting and logging."
msgstr "" msgstr ""
...@@ -1722,21 +1739,27 @@ msgstr "" ...@@ -1722,21 +1739,27 @@ msgstr ""
msgid "Enable and configure Prometheus metrics." msgid "Enable and configure Prometheus metrics."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Enable classification control using an external service" msgid "Enable classification control using an external service"
msgstr "" msgstr ""
msgid "Enable or disable version check and usage ping." msgid "Enable or disable version check and usage ping."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Enable reCAPTCHA or Akismet and set IP limits." msgid "Enable reCAPTCHA or Akismet and set IP limits."
msgstr "" msgstr ""
msgid "Enable the Performance Bar for a given group." msgid "Enable the Performance Bar for a given group."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Enabled" msgid "Enabled"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Environments|An error occurred while fetching the environments." msgid "Environments|An error occurred while fetching the environments."
msgstr "" msgstr ""
...@@ -1785,6 +1808,7 @@ msgstr "" ...@@ -1785,6 +1808,7 @@ msgstr ""
msgid "Environments|You don't have any environments right now." msgid "Environments|You don't have any environments right now."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Epic will be removed! Are you sure?" msgid "Epic will be removed! Are you sure?"
msgstr "" msgstr ""
...@@ -1797,6 +1821,8 @@ msgstr "" ...@@ -1797,6 +1821,8 @@ msgstr ""
msgid "Epics let you manage your portfolio of projects more efficiently and with less effort" msgid "Epics let you manage your portfolio of projects more efficiently and with less effort"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Error Reporting and Logging" msgid "Error Reporting and Logging"
msgstr "" msgstr ""
...@@ -2006,7 +2032,14 @@ msgstr "" ...@@ -2006,7 +2032,14 @@ msgstr ""
msgid "GeoNodes|Checksummed" msgid "GeoNodes|Checksummed"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "GeoNodes|Database replication lag:" msgid "GeoNodes|Database replication lag:"
=======
msgid "GitLab CI Linter has been moved"
msgstr ""
msgid "GitLab Runner section"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "GeoNodes|Disabling a node stops the sync process. Are you sure?" msgid "GeoNodes|Disabling a node stops the sync process. Are you sure?"
...@@ -2564,9 +2597,12 @@ msgstr "" ...@@ -2564,9 +2597,12 @@ msgstr ""
msgid "Lock %{issuableDisplayName}" msgid "Lock %{issuableDisplayName}"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Lock not found" msgid "Lock not found"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Locked" msgid "Locked"
msgstr "" msgstr ""
...@@ -2645,6 +2681,7 @@ msgstr "" ...@@ -2645,6 +2681,7 @@ msgstr ""
msgid "Metrics - Prometheus" msgid "Metrics - Prometheus"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Metrics|Business" msgid "Metrics|Business"
msgstr "" msgstr ""
...@@ -2714,6 +2751,8 @@ msgstr "" ...@@ -2714,6 +2751,8 @@ msgstr ""
msgid "Metrics|e.g. req/sec" msgid "Metrics|e.g. req/sec"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Milestone" msgid "Milestone"
msgstr "" msgstr ""
...@@ -3556,6 +3595,7 @@ msgstr "" ...@@ -3556,6 +3595,7 @@ msgstr ""
msgid "Repository" msgid "Repository"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Repository has no locks." msgid "Repository has no locks."
msgstr "" msgstr ""
...@@ -3565,6 +3605,11 @@ msgstr "" ...@@ -3565,6 +3605,11 @@ msgstr ""
msgid "Repository mirror settings" msgid "Repository mirror settings"
msgstr "" msgstr ""
=======
msgid "Repository maintenance"
msgstr ""
>>>>>>> upstream/master
msgid "Repository storage" msgid "Repository storage"
msgstr "" msgstr ""
...@@ -3606,12 +3651,15 @@ msgstr "" ...@@ -3606,12 +3651,15 @@ msgstr ""
msgid "Reviewing (merge request !%{mergeRequestId})" msgid "Reviewing (merge request !%{mergeRequestId})"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Roadmap" msgid "Roadmap"
msgstr "" msgstr ""
msgid "Run CI/CD pipelines for external repositories" msgid "Run CI/CD pipelines for external repositories"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Runners" msgid "Runners"
msgstr "" msgstr ""
...@@ -3717,9 +3765,12 @@ msgstr "" ...@@ -3717,9 +3765,12 @@ msgstr ""
msgid "Service Templates" msgid "Service Templates"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Service URL" msgid "Service URL"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Session expiration, projects limit and attachment size." msgid "Session expiration, projects limit and attachment size."
msgstr "" msgstr ""
...@@ -3729,9 +3780,12 @@ msgstr "" ...@@ -3729,9 +3780,12 @@ msgstr ""
msgid "Set default and restrict visibility levels. Configure import sources and git access protocol." msgid "Set default and restrict visibility levels. Configure import sources and git access protocol."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Set max session time for web terminal." msgid "Set max session time for web terminal."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Set notification email for abuse reports." msgid "Set notification email for abuse reports."
msgstr "" msgstr ""
...@@ -3782,6 +3836,7 @@ msgid_plural "Showing %d events" ...@@ -3782,6 +3836,7 @@ msgid_plural "Showing %d events"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
<<<<<<< HEAD
msgid "Sidebar|Change weight" msgid "Sidebar|Change weight"
msgstr "" msgstr ""
...@@ -3807,18 +3862,31 @@ msgid "Slack application" ...@@ -3807,18 +3862,31 @@ msgid "Slack application"
msgstr "" msgstr ""
msgid "Snippets" msgid "Snippets"
=======
msgid "Sign-in restrictions"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Something went wrong on our end" msgid "Sign-up restrictions"
msgstr "" msgstr ""
msgid "Something went wrong on our end." msgid "Size and domain settings for static websites"
msgstr ""
msgid "Snippets"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Something went wrong when toggling the button" msgid "Something went wrong when toggling the button"
msgstr "" msgstr ""
msgid "Something went wrong while fetching Dependency Scanning." msgid "Something went wrong while fetching Dependency Scanning."
=======
msgid "Something went wrong on our end"
msgstr ""
msgid "Something went wrong on our end."
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Something went wrong while fetching SAST." msgid "Something went wrong while fetching SAST."
...@@ -4469,6 +4537,7 @@ msgstr "" ...@@ -4469,6 +4537,7 @@ msgstr ""
msgid "To import an SVN repository, check out %{svn_link}." msgid "To import an SVN repository, check out %{svn_link}."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>." msgid "To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>."
msgstr "" msgstr ""
...@@ -4481,6 +4550,11 @@ msgstr "" ...@@ -4481,6 +4550,11 @@ msgstr ""
msgid "To view the roadmap, add a planned start or finish date to one of your epics in this group or its subgroups. Only epics in the past 3 months and the next 3 months are shown." msgid "To view the roadmap, add a planned start or finish date to one of your epics in this group or its subgroups. Only epics in the past 3 months and the next 3 months are shown."
msgstr "" msgstr ""
=======
msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
msgstr ""
>>>>>>> upstream/master
msgid "Todo" msgid "Todo"
msgstr "" msgstr ""
...@@ -4517,12 +4591,15 @@ msgstr "" ...@@ -4517,12 +4591,15 @@ msgstr ""
msgid "Turn on Service Desk" msgid "Turn on Service Desk"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
msgid "Unlock" msgid "Unlock"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Unlocked" msgid "Unlocked"
msgstr "" msgstr ""
...@@ -4577,9 +4654,12 @@ msgstr "" ...@@ -4577,9 +4654,12 @@ msgstr ""
msgid "Use your global notification setting" msgid "Use your global notification setting"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Used by members to sign in to your group in GitLab" msgid "Used by members to sign in to your group in GitLab"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "User and IP Rate Limits" msgid "User and IP Rate Limits"
msgstr "" msgstr ""
...@@ -4996,12 +5076,15 @@ msgstr "" ...@@ -4996,12 +5076,15 @@ msgstr ""
msgid "ciReport|Unapproved vulnerabilities (red) can be marked as approved. %{helpLink}" msgid "ciReport|Unapproved vulnerabilities (red) can be marked as approved. %{helpLink}"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "ciReport|no vulnerabilities" msgid "ciReport|no vulnerabilities"
msgstr "" msgstr ""
msgid "command line instructions" msgid "command line instructions"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "connecting" msgid "connecting"
msgstr "" msgstr ""
...@@ -5067,9 +5150,12 @@ msgstr "" ...@@ -5067,9 +5150,12 @@ msgstr ""
msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage is %{emphasisStart} unchanged %{emphasisEnd} at %{memoryFrom}MB" msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage is %{emphasisStart} unchanged %{emphasisEnd} at %{memoryFrom}MB"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "mrWidget|Add approval" msgid "mrWidget|Add approval"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "mrWidget|Allows edits from maintainers" msgid "mrWidget|Allows edits from maintainers"
msgstr "" msgstr ""
......
spec/factories/ci/build_metadata.rb deleted 100644 → 0
View file @ 2c84eb5c
FactoryBot.define do
factory :ci_build_metadata, class: Ci::BuildMetadata do
build factory: :ci_build
after(:build) do |build_metadata, _|
build_metadata.project ||= build_metadata.build.project
end
end
end
spec/models/ci/build_metadata_spec.rb
View file @ 241309d6
...@@ -13,7 +13,7 @@ describe Ci::BuildMetadata do ...@@ -13,7 +13,7 @@ describe Ci::BuildMetadata do
end end
let(:build) { create(:ci_build, pipeline: pipeline) } let(:build) { create(:ci_build, pipeline: pipeline) }
let(:build_metadata) { create(:ci_build_metadata, build: build) } let(:build_metadata) { build.metadata }
describe '#update_timeout_state' do describe '#update_timeout_state' do
subject { build_metadata } subject { build_metadata }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7