summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵consolidate-page-widths-part02Andreas Kämmerle2018-09-13849-8697/+11656
|\ | | | | | | consolidate-page-widths-part02
| * Merge branch ↵Grzegorz Bizon2018-09-1320-23/+1116
| |\ | | | | | | | | | | | | | | | | | | | | | | | | '42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master' Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre" Closes #42861 See merge request gitlab-org/gitlab-ce!21603
| | * Inline initialize_yaml_processorMatija Čupić2018-09-121-5/+1
| | |
| | * Stack rescue blocks for Gitlab::Ci::Config#initializeMatija Čupić2018-09-111-10/+8
| | |
| | * Add missing frozen string literal commentsMatija Čupić2018-09-119-0/+18
| | |
| | * Add link to CE move MRMatija Čupić2018-09-111-2/+2
| | |
| | * Fix references to ee .gitlab-ci.yml spec fixturesMatija Čupić2018-09-082-3/+3
| | |
| | * Add CHANGELOGMatija Čupić2018-09-081-0/+5
| | |
| | * Reconcile differences in spec/models/blob_viewerMatija Čupić2018-09-081-1/+1
| | |
| | * Reconcile differences in lib/gitlab/ciMatija Čupić2018-09-083-72/+219
| | |
| | * Reconcile differences in doc/ci/yamlMatija Čupić2018-09-081-141/+181
| | |
| | * Reconcile differences in lib/gitlab/ci/externalMatija Čupić2018-09-084-20/+23
| | |
| | * Reconcile differences in lib/gitlab/ci/external/fileMatija Čupić2018-09-085-43/+134
| | |
| | * Stub http request on specs intead of mocking HTTPartyMatija Čupić2018-09-074-24/+32
| | | | | | | | | | | | CE mirror of bb2a9fde8e6a4d1df13638fe336f641b9c72ef59
| | * Replace gitlab-ci.yml for .gitlab-ci.yml on yaml docMatija Čupić2018-09-071-6/+6
| | | | | | | | | | | | CE mirror of cfc0bf818d5c0fb5141832d4caf1fcc34de3e9f9
| | * Update yaml documentation examplesMatija Čupić2018-09-071-26/+50
| | | | | | | | | | | | CE mirror of b8d12ec36b50fdae966361b4d6acc4791ef1830c
| | * Address MR suggestionsMatija Čupić2018-09-0713-66/+66
| | | | | | | | | | | | CE mirror of c4578b951e331fe8c75cd4f948ce74cec6587bad
| | * Update YAML include doc to make it more specificMatija Čupić2018-09-071-42/+57
| | | | | | | | | | | | CE mirror or d1baf60ff99f6e56a003b8b6ba12c6aafce10659
| | * Improve external architectureMatija Čupić2018-09-0722-315/+445
| | | | | | | | | | | | CE mirror of 4f17c7b2c30188302e6a73421acbf5a09fb2c823
| | * Make Repository#blob_data_at publicMatija Čupić2018-09-077-18/+132
| | | | | | | | | | | | CE mirror of 17de13ada1a98da060802c55889489a512183cd1
| | * Address MR commentsMatija Čupić2018-09-078-48/+67
| | | | | | | | | | | | CE mirror of 1269dc47b7f8d1a9913de326c9bd356d3e603663
| | * Change ExternalFile to retrieve local file from repository instead of GitLab ↵Matija Čupić2018-09-0712-52/+93
| | | | | | | | | | | | | | | | | | project CE mirror of 03c6094997023d9c8875ced421a6c9ef39a4af44
| | * Import external files in Gitlab CI configMatija Čupić2018-09-074-8/+13
| | | | | | | | | | | | CE mirror of a10b777f8cb1902bba3964a4cbad2b1dd6bce785
| | * Load external files in configMatija Čupić2018-09-0713-196/+89
| | | | | | | | | | | | CE mirror of 8e03a6619be44fdaf19a6c13284ea8e51377b311
| | * Build barebones for ExternalFiles librariesMatija Čupić2018-09-0713-4/+550
| | | | | | | | | | | | CE mirror of 30ca00f17034f654403ec7cb5dc370d1e5db8152
| * | Merge branch 'sh-strip-sentry-dsn' into 'master'Robert Speicher2018-09-122-0/+36
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Strip whitespace from Sentry URL Closes #49621 See merge request gitlab-org/gitlab-ce!21703
| | * | Remove unnecessary changelog entryRobert Speicher2018-09-121-5/+0
| | | | | | | | | | | | | | | | [ci skip]
| | * | Strip whitespace from Sentry URLStan Hu2018-09-123-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding extra whitespace in the DSN could prevent the server from starting due to InvalidURIErrors in sentry-raven. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49621
| * | | Merge branch '50678-ignores-project-pending-delete' into 'master'Robert Speicher2018-09-125-3/+41
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Resolve "500 Internal Server Error: Deleting branch of deleted project" Closes #50678 See merge request gitlab-org/gitlab-ce!21542
| | * | Resolve "500 Internal Server Error: Deleting branch of deleted project"🙈 jacopo beschi 🙉2018-09-125-3/+41
| |/ /
| * | Merge branch 'clean-gitlab-git' into 'master'Douwe Maan2018-09-1232-3148/+284
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Rugged and shell code from Gitlab::Git Closes gitaly#1124 See merge request gitlab-org/gitlab-ce!21488
| | * | Remove Rugged and shell code from Gitlab::GitAlejandro Rodríguez2018-09-1232-3148/+284
| | | |
| * | | Merge branch 'fix-mention-in-edit-mr' into 'master'Robert Speicher2018-09-124-2/+26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mention in edit mr Closes #50608 See merge request gitlab-org/gitlab-ce!21696
| | * | | Fix mention in edit mrAlin Ciciu2018-09-124-2/+26
| |/ / /
| * | | Merge branch 'issue_50528' into 'master'Stan Hu2018-09-123-1/+35
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log project services sidekiq failures Closes #50528 See merge request gitlab-org/gitlab-ce!21336
| | * | | Log project services errors when executing asyncFelipe Artur2018-09-103-1/+35
| | | | |
| * | | | Merge branch 'use-gitlab-ui-pagination-for-groups' into 'master'Clement Ho2018-09-126-15/+127
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use GitLab UI pagination component for groups See merge request gitlab-org/gitlab-ce!21287
| | * | | | Use GitLab ui pagination component for groupsAdriel Santiago2018-09-116-15/+127
| | | | | |
| * | | | | Merge branch 'update-gitlab-shell' into 'master'Stan Hu2018-09-122-1/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab shell See merge request gitlab-org/gitlab-ce!21701
| | * | | | | Update GitLab Shell to v8.3.2Nick Thomas2018-09-122-1/+6
| |/ / / / /
| * | | | | Merge branch 'code_review-assign-maintainers-different-team' into 'master'Douwe Maan2018-09-121-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update code_review.md to include a recommendation for assigning maintainers from different teams See merge request gitlab-org/gitlab-ce!21644
| | * | | | | Update code_review.md to include a recommendation for assigning maintainers ↵Luke Bennett2018-09-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from different teams Improve recommended maintainer docs
| * | | | | | Merge branch 'initialize-projects-with-readme' into 'master'Douwe Maan2018-09-124-0/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize projects with readme See merge request gitlab-org/gitlab-ce!21617
| | * | | | | | Initialize projects with readmeSteve2018-09-124-0/+15
| |/ / / / / /
| * | | | | | Merge branch '51200-markdown-footnotes-don-t-render-when-inside-a-table' ↵Douwe Maan2018-09-122-1/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Markdown footnotes don't render when inside a table..." Closes #51200 See merge request gitlab-org/gitlab-ce!21675
| | * | | | | | Updated commonmarker gem to 0.17.13Brett Walker2018-09-112-1/+18
| | | | | | | |
| * | | | | | | Merge branch 'bjk/49849_node_metrics_update' into 'master'Stan Hu2018-09-121-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update example Prometheus queries Closes #49849 See merge request gitlab-org/gitlab-ce!21695
| | * | | | | | | Update example Prometheus queriesBen Kochie2018-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update metric names to match current release. * Improve descriptions. * Improve examples to show more query language functionality. Memory: * Show use of `or` function. * Automatically select "MemAvailable" kernel metric if possible. CPU: * Show use of `avg without ...`. * Show CPU utilization per node. Network: * Show use of `!=` label matching. * Don't show "localhost" metrics.
| * | | | | | | | Merge branch '50989-add-trigger-information-to-job-api' into 'master'Kamil Trzciński2018-09-128-2/+99
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add trigger information for job API Closes #50989 See merge request gitlab-org/gitlab-ce!21495
| | * | | | | | | | Add trigger information for job APISteve Azzopardi2018-09-128-2/+99
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create new entity called TriggerVariablesEnitity for trigger variables, to aid reuseablity in the future. Update JSON schema to include trigger information in the response. Refactor rspec tests a bit to reduce duplication and for the `context` to make sense. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50989
View Lorry Controller Status