summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Show pipeline progressshow-pipeline-progressShinya Maeda2019-07-078-1/+31
| | | | We calculate pipeline progress from the count of alive builds.
* 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
| | | | | | |
| * | | | | | Adding order by to list runner jobs api.sujay patel2019-07-054-1/+65
| | | | | | |
* | | | | | | Merge branch 'ce-10283-notifications-for-ci-minutes-quota-limit-approaching' ↵James Lopez2019-07-052-0/+10
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14328 See merge request gitlab-org/gitlab-ce!30003
| * | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14328ce-10283-notifications-for-ci-minutes-quota-limit-approachingRubén Dávila2019-07-052-0/+10
| | | | | | |
* | | | | | | Merge branch 'zj-remove-stale-feature-flag-keys' into 'master'Andreas Brandl2019-07-052-1/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused Gitaly feature flags See merge request gitlab-org/gitlab-ce!30302
| * | | | | | | Remove unused Gitaly feature flagsZeger-Jan van de Weg2019-07-042-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GitLab was migrating to Gitaly, feature flags were used. These are now out of use, and essentially a no-op. But they do make the output of chatops ugly and the feature table is selected in full by the application.
* | | | | | | | Merge branch 'create-merge-train-ref-ce' into 'master'Douwe Maan2019-07-0511-26/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Port: Extend `MergeToRefService` to create merge ref from an arbitrary ref See merge request gitlab-org/gitlab-ce!30361
| * | | | | | | | Extend MergeToRefService for creating merge ref from the other refShinya Maeda2019-07-0511-26/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, MergeToRefService is specifically designed for createing merge commits from source branch and target branch of merge reqeusts. We extend this behavior to source branch and any target ref paths.
* | | | | | | | | Merge branch 'make-explicit-endpoint-abort-in-auto-merge-ce' into 'master'Kamil Trzciński2019-07-0512-15/+129
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Port: Split AutoMergeService interfaces into two `cancel` and `abort` See merge request gitlab-org/gitlab-ce!30249
| * | | | | | | | | Split AutoMergeService interfaces into two `cancel` and `abort`make-explicit-endpoint-abort-in-auto-merge-ceShinya Maeda2019-07-0512-15/+129
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Create explicit endpoint - abort.
* | | | | | | | | Merge branch 'fetch-forked-projects-create-mr' into 'master'Filipa Lacerda2019-07-0516-15/+599
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create private merge requests in forks Closes #58583 See merge request gitlab-org/gitlab-ce!29984
| * | | | | | | | | Create private merge requests in forksPhil Hughes2019-07-0516-15/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
View Lorry Controller Status