summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Apply suggestion to doc/ci/pipelines.md20190708_CI_Docspage_EditsEvan Read2019-07-241-1/+1
|
* Apply suggestion to doc/ci/pipelines.mdEvan Read2019-07-241-1/+1
|
* Update pipelines.md - update with correct CI/CD webcast link.Agnes Oetama2019-07-221-1/+1
|
* Update index.md - update with correct CI/CD webcast link.Agnes Oetama2019-07-221-1/+1
|
* Update README.md - update correct link to mastering CICD webcastAgnes Oetama2019-07-221-1/+1
|
* Add CTA to watch Mastering CI/CD webcast from doc/ci/pipelines.mdAgnes Oetama2019-07-081-0/+5
| | | This docs page is appearing for our SEM paid keywords so Marketing would like to optimize spend by driving the traffic back to a gated about.gitlab page with relevant CI content.
* Add CTA to watch Mastering CI/CD webcast from doc/ci/introduction/index.mdAgnes Oetama2019-07-081-0/+5
| | | This docs page is appearing for our SEM paid keywords so Marketing would like to optimize spend by driving the traffic back to gated about.gitlab pages.
* Update README.md - add CTA to watch Mastering CI/CD webcast and 5 teams that ↵Agnes Oetama2019-07-081-0/+6
| | | | made the switch to GitLab CI/CD article
* Merge branch 'qa/refactor-plan-issues-check-mentions-for-xss-spec' into 'master'Mark Lapierre2019-07-081-3/+4
|\ | | | | | | | | Refactor end-to-end test See merge request gitlab-org/gitlab-ce!30421
| * Refactor end-to-end testqa/refactor-plan-issues-check-mentions-for-xss-specWalmyr Lima2019-07-051-3/+4
| | | | | | | | | | | | - to be explicit when fabricating resources via API or browser UI - and to improve test speed by fabricating some resources via API instead of via the GUI.
* | Merge branch ↵Evan Read2019-07-081-1/+7
|\ \ | | | | | | | | | | | | | | | | | | 'da-add-note-that-internal-url-work-with-load-balancer-that-terminates-tls-docs' into 'master' Geo - Add note that Internal URL works only with a Load Balancer with TLS termination See merge request gitlab-org/gitlab-ce!30372
| * | Add note that internal URL works only with a LB with TLS terminationda-add-note-that-internal-url-work-with-load-balancer-that-terminates-tls-docsDouglas Barbosa Alexandre2019-07-051-1/+7
| | |
* | | Merge branch 'exclude-documentation-from-danger' into 'master'Nick Thomas2019-07-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update dangerfile to exclude docs ci yaml See merge request gitlab-org/gitlab-ce!30335
| * | | Update dangerfile to exclude docs ci yamlMarcel Amirault2019-07-061-1/+1
|/ / /
* | | Merge branch 'sh-disable-reactive-caching-automatic-retries' into 'master'Nick Thomas2019-07-063-3/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent amplification of ReactiveCachingWorker jobs upon failures Closes #64176 See merge request gitlab-org/gitlab-ce!30432
| * | | Prevent amplification of ReactiveCachingWorker jobs upon failuressh-disable-reactive-caching-automatic-retriesStan Hu2019-07-063-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `ReactiveCachingWorker` hits an SSL or other exception that occurs quickly and reliably, automatically rescheduling a new worker could lead to excessive number of jobs being scheduled. This happens because not only does the failed job get rescheduled in a minute, but each Sidekiq retry will also add even more rescheduled jobs. In busy instances, this can become an issue because large numbers of `ReactiveCachingWorker` running can cause high rates of `ExclusiveLease` reads to occur and possibly saturate the Redis server with queries. We now disable this automatic retry and rely on Sidekiq to perform its 3 retries with a backoff period. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64176
* | | | Merge branch 'sh-upgrade-rouge-3.5.1' into 'master'Grzegorz Bizon2019-07-063-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade Rouge to 3.5.1 See merge request gitlab-org/gitlab-ce!30431
| * | | | Upgrade Rouge to 3.5.1sh-upgrade-rouge-3.5.1Stan Hu2019-07-063-3/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | This release includes continued improvements to the library, fixes for a number of lexers and support for three new languages: https://github.com/rouge-ruby/rouge/releases
* | | | Merge branch 'revert-01c917e3' into 'master'Thong Kuah2019-07-061-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Revert "Increase rspec parallelism" See merge request gitlab-org/gitlab-ce!30429
| * | | Revert "Merge branch '63825-increase-rspec-parallelism' into 'master'"revert-01c917e3Nick Thomas2019-07-051-2/+2
| | | | | | | | | | | | This reverts merge request !30130
* | | | Merge branch 'winh-notes-service-applySuggestion' into 'master'Fatih Acet2019-07-054-10/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Remove applySuggestion from notes service See merge request gitlab-org/gitlab-ce!30399
| * | | Remove applySuggestion from notes serviceWinnie Hellmann2019-07-054-10/+11
|/ / /
* | | Merge branch '64176-fix-error-handling' into 'master'Mayra Cabrera2019-07-054-5/+19
|\ \ \ | | | | | | | | | | | | | | | | Fix invalid SSL certificate errors on Drone CI service See merge request gitlab-org/gitlab-ce!30422
| * | | Add OpenSSL::OpenSSLError to HTTP_ERRORSDouglas Barbosa Alexandre2019-07-054-5/+19
|/ / / | | | | | | | | | | | | | | | Some services can raise OpenSSL::X509::CertificateError due to an invalid SSL certificates, with OpenSSL::OpenSSLError we can handle these errors.
* | | Merge branch 'dm-queue-mirror-jobs-in-batches-drain-ce' into 'master'Bob Van Landuyt2019-07-051-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Add queue_size method to ApplicationWorker See merge request gitlab-org/gitlab-ce!30416
| * | | Add queue_size method to ApplicationWorkerdm-queue-mirror-jobs-in-batches-drain-ceDouwe Maan2019-07-051-0/+6
| | | |
* | | | Merge branch 'docs/edit-job-artifacts-text' into 'master'Achilleas Pipinellis2019-07-051-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Edit text, using correct terms See merge request gitlab-org/gitlab-ce!30382
| * | | | Edit text, using correct termsEvan Read2019-07-051-4/+7
|/ / / /
* | | | Merge branch 'update-license-management-docs' into 'master'Achilleas Pipinellis2019-07-051-2/+9
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Added experimental languages to license management docs. See merge request gitlab-org/gitlab-ce!29932
| * | | Added experimental languages to license management docs.Zachary Knight2019-07-051-2/+9
|/ / /
* | | Merge branch 'qa-fix-issue-resource' into 'master'Walmyr2019-07-051-1/+5
|\ \ \ | | | | | | | | | | | | | | | | Fix failing e2e tests - initialize Issue labels See merge request gitlab-org/gitlab-ce!30375
| * | | Initialize Issue labelsqa-fix-issue-resourceMark Lapierre2019-07-051-1/+5
| | | | | | | | | | | | | | | | | | | | This provides a valid default value when labels are not specified explicitly.
* | | | Merge branch '63976-discussion-sticky-header' into 'master'Phil Hughes2019-07-051-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix top position of sticky file header on discussion tab Closes #63976 See merge request gitlab-org/gitlab-ce!30410
| * | | Fix top position of sticky file header on discussion tabAnnabel Dunstone Gray2019-07-051-1/+1
| | | |
* | | | Merge branch 'docs/edit-gitlab-com-visibility-text' into 'master'Achilleas Pipinellis2019-07-051-9/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Edit new text on visibility setting See merge request gitlab-org/gitlab-ce!30281
| * | | | Edit new text on visibility settingEvan Read2019-07-051-9/+7
|/ / / /
* | | | Merge branch 'fix_document_for_install_from_source-docs' into 'master'Achilleas Pipinellis2019-07-051-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Documentation: Update installation from source document See merge request gitlab-org/gitlab-ce!30380
| * | | | Update installation.mdKyohei Uemura2019-07-051-3/+3
|/ / / / | | | | | | | | | | | | | | | | Line 170(make install) causes permission error. This command should execute with sudo.
* | | | Merge branch 'issue-61565' into 'master'Annabel Dunstone Gray2019-07-053-19/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unresolved class and fixed height in discussion header See merge request gitlab-org/gitlab-ce!28440
| * | | | Remove unresolved class and fixed height in discussion headerDavid Palubin2019-07-053-19/+13
|/ / / /
* | | | Merge branch 'docs-its-relative-8' into 'master'Achilleas Pipinellis2019-07-0518-43/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Change even more absolute links to relative See merge request gitlab-org/gitlab-ce!30387
| * | | | Change absolute links to relativeMarcel Amirault2019-07-0518-43/+43
|/ / / / | | | | | | | | | | | | | | | | Change assorted absolute links to ce and ee docs to relative links
* | | | Merge branch '12550-fullscrean' into 'master'Phil Hughes2019-07-052-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/layouts/fullscreen.html.haml Closes gitlab-ee#12550 See merge request gitlab-org/gitlab-ce!30403
| * | | | Removes EE differences12550-fullscreanFilipa Lacerda2019-07-052-0/+7
| | | | |
* | | | | Merge branch '51794-add-ordering-to-runner-jobs-api' into 'master'Lin Jen-Shin2019-07-056-1/+93
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding order by to list runner jobs api. Closes #51794 See merge request gitlab-org/gitlab-ce!29629
| * \ \ \ \ Updating branch, and minor dix.sujay2019-07-050-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Resolving conflicts.sujay2019-07-036-35/+63
| | |\ \ \ \ \
| | | * | | | | Adding order by to list runner jobs api.sujay patel2019-06-226-1/+93
| | | | | | | |
| | * | | | | | Adding order by to list runner jobs api.sujay patel2019-07-034-1/+65
| | | | | | | |
| * | | | | | | Adding order by to list runner jobs api.sujay patel2019-07-056-35/+63
| | | | | | | |