summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* QA fixes or improvements don't need an exception requestRémy Coutable2018-06-051-0/+1
* Merge branch 'patch-29' into 'master'Rémy Coutable2018-06-051-1/+1
|\
| * Fixing dead link in the readme fileEddie Stubbington2018-06-051-1/+1
|/
* Merge branch 'docs/add-configuration-team-to-the-list' into 'master'Rémy Coutable2018-06-051-1/+1
|\
| * Add Configuration team to the listdocs/add-configuration-team-to-the-listFabio Busatto2018-06-051-1/+1
* | Merge branch 'write-config-not-found' into 'master'Sean McGivern2018-06-052-0/+17
|\ \
| * | Prevent Gitaly WriteConfig log noiseJacob Vosmaer (GitLab)2018-06-052-0/+17
|/ /
* | Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński2018-06-059-4/+202
|\ \
| * | Fix typo in spec. Add a test for the case of when trace is stored in databaseadd-background-migrations-for-not-archived-tracesShinya Maeda2018-06-042-4/+26
| * | Revise comments in ArchiveLegacyTracesShinya Maeda2018-06-041-3/+3
| * | Add type_build to ScheduleToArchiveLegacyTraces::BuildShinya Maeda2018-06-041-1/+3
| * | Fix specs. Rename migration file name which was conflicted with background mi...Shinya Maeda2018-06-045-74/+78
| * | Directly refer application code from migration codeShinya Maeda2018-06-045-85/+22
| * | Add changelogShinya Maeda2018-06-041-0/+5
| * | Add background migrations to arhive legacy tracesShinya Maeda2018-06-045-1/+229
* | | Merge branch 'override-consider-extend' into 'master'Nick Thomas2018-06-052-65/+121
|\ \ \
| * | | Also verify if extending would override a class methodoverride-consider-extendLin Jen-Shin2018-06-052-65/+121
* | | | Merge branch '46452-nomethoderror-undefined-method-previous_changes-for-nil-n...Kamil Trzciński2018-06-053-1/+10
|\ \ \ \
| * | | | Use nullcheck operator instead of checking for nullMatija Čupić2018-06-051-1/+1
| * | | | Add CHANGELOG entry46452-nomethoderror-undefined-method-previous_changes-for-nil-nilclassMatija Čupić2018-05-281-0/+5
| * | | | Add check for nil auto_devops in Projects::UpdateServiceMatija Čupić2018-05-282-1/+5
* | | | | Merge branch 'gh-importer-transactions' into 'master'Nick Thomas2018-06-054-29/+121
|\ \ \ \ \
| * | | | | Perform pull request IO work outside a transactiongh-importer-transactionsYorick Peterse2018-06-044-29/+121
| | |/ / / | |/| | |
* | | | | Merge branch 'docs-gitlab-ee-6184_update_security_products_job_name' into 'ma...Achilleas Pipinellis2018-06-051-2/+2
|\ \ \ \ \
| * | | | | Update security products job and artifact names in documentation. Refs gitlab...docs-gitlab-ee-6184_update_security_products_job_nameOlivier Gonzalez2018-06-011-2/+2
* | | | | | Merge branch 'rails5-fix-46236' into 'master'Yorick Peterse2018-06-056-14/+26
|\ \ \ \ \ \
| * | | | | | Support rails5 in postgres indexes function and fix some migrationsJasper Maes2018-06-056-14/+26
* | | | | | | Merge branch 'backstage/gb/fix-rubocop-offense-in-build-specs' into 'master'Grzegorz Bizon2018-06-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix Rubocop offense in build specsbackstage/gb/fix-rubocop-offense-in-build-specsGrzegorz Bizon2018-06-051-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'optimise-pages-service-calling' into 'master'Grzegorz Bizon2018-06-058-78/+88
|\ \ \ \ \ \ \
| * | | | | | | Remove PagesService and instead make it explicit that we call PagesWorkeroptimise-pages-service-callingKamil Trzciński2018-06-055-69/+83
| * | | | | | | Remove unused running_or_pending_build_countremove-unused-query-in-hooksKamil Trzciński2018-06-044-9/+5
* | | | | | | | Merge branch 'rs-projects-update-service-parity' into 'master'Rémy Coutable2018-06-051-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Yield to an optional block in Projects::UpdateServicers-projects-update-service-parityRobert Speicher2018-06-041-0/+2
| * | | | | | | | Bring CE-EE parity to app/services/projects/update_service.rbRobert Speicher2018-06-041-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'sh-fix-pipeline-jobs-nplus-one' into 'master'Rémy Coutable2018-06-053-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Eliminate N+1 queries for CI job artifacts in /api/projects/:id/pipelines/:pi...sh-fix-pipeline-jobs-nplus-oneStan Hu2018-06-043-0/+18
| * | | | | | | | Remove N+1 query for author in issues APIStan Hu2018-06-046-22/+78
* | | | | | | | | Merge branch '45820-add-xcode-link' into 'master'Phil Hughes2018-06-055-0/+61
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resolve "Add Xcode Button in UI"André Luís2018-06-055-0/+61
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ide-alignment-fixes' into 'master'Filipa Lacerda2018-06-052-6/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed SVG alignmentide-alignment-fixesPhil Hughes2018-06-041-1/+1
| * | | | | | | | | Fixed alignment issues with IDE sidebarPhil Hughes2018-06-042-5/+26
* | | | | | | | | | Merge branch 'fix-jobs-log' into 'master'Filipa Lacerda2018-06-051-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix jobs log background colorfix-jobs-logClement Ho2018-06-041-0/+5
* | | | | | | | | | | Merge branch 'blackst0ne-update-gemfile-rails5' into 'master'Rémy Coutable2018-06-051-36/+35
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | [Rails5] Update Gemfile.rails5.lockblackst0ne-update-gemfile-rails5blackst0ne2018-06-051-36/+35
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'presigned-multipart-uploads' into 'master'Grzegorz Bizon2018-06-0515-123/+575
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update validatorpresigned-multipart-uploadsKamil Trzciński2018-06-045-39/+22
| * | | | | | | | | | Support presigned multipart uploadsKamil Trzciński2018-06-0415-123/+592