summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into consoli...consolidate-page-widths-part02Andreas Kämmerle2018-09-13849-8697/+11656
|\
| * Merge branch '42861-move-include-external-files-in-gitlab-ci-yml-from-starter...Grzegorz Bizon2018-09-1320-23/+1116
| |\
| | * 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
| | * Replace gitlab-ci.yml for .gitlab-ci.yml on yaml docMatija Čupić2018-09-071-6/+6
| | * Update yaml documentation examplesMatija Čupić2018-09-071-26/+50
| | * Address MR suggestionsMatija Čupić2018-09-0713-66/+66
| | * Update YAML include doc to make it more specificMatija Čupić2018-09-071-42/+57
| | * Improve external architectureMatija Čupić2018-09-0722-315/+445
| | * Make Repository#blob_data_at publicMatija Čupić2018-09-077-18/+132
| | * Address MR commentsMatija Čupić2018-09-078-48/+67
| | * Change ExternalFile to retrieve local file from repository instead of GitLab ...Matija Čupić2018-09-0712-52/+93
| | * Import external files in Gitlab CI configMatija Čupić2018-09-074-8/+13
| | * Load external files in configMatija Čupić2018-09-0713-196/+89
| | * Build barebones for ExternalFiles librariesMatija Čupić2018-09-0713-4/+550
| * | Merge branch 'sh-strip-sentry-dsn' into 'master'Robert Speicher2018-09-122-0/+36
| |\ \
| | * | Remove unnecessary changelog entryRobert Speicher2018-09-121-5/+0
| | * | Strip whitespace from Sentry URLStan Hu2018-09-123-0/+41
| * | | 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"🙈 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::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 mrAlin Ciciu2018-09-124-2/+26
| |/ / /
| * | | Merge branch 'issue_50528' into 'master'Stan Hu2018-09-123-1/+35
| |\ \ \
| | * | | 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 groupsAdriel Santiago2018-09-116-15/+127
| * | | | | Merge branch 'update-gitlab-shell' into 'master'Stan Hu2018-09-122-1/+6
| |\ \ \ \ \
| | * | | | | 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 f...Luke Bennett2018-09-121-2/+3
| * | | | | | Merge branch 'initialize-projects-with-readme' into 'master'Douwe Maan2018-09-124-0/+15
| |\ \ \ \ \ \
| | * | | | | | Initialize projects with readmeSteve2018-09-124-0/+15
| |/ / / / / /
| * | | | | | Merge branch '51200-markdown-footnotes-don-t-render-when-inside-a-table' into...Douwe Maan2018-09-122-1/+18
| |\ \ \ \ \ \
| | * | | | | | 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 queriesBen Kochie2018-09-121-4/+4
| * | | | | | | | Merge branch '50989-add-trigger-information-to-job-api' into 'master'Kamil Trzciński2018-09-128-2/+99
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add trigger information for job APISteve Azzopardi2018-09-128-2/+99
| |/ / / / / / / /