summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Render 'invalid' if #target_branch_missing?47196-actionview-missingtemplate-missing-template-projects-merge_requests-invalid-projects-merge_requests-application-invalid-prAsh McKenzie2018-06-051-18/+7
* Rename #check_if_can_be_merged -> #mark_merge_request_mergeableAsh McKenzie2018-06-051-2/+2
* Rename #close_merge_request_without_source_projectAsh McKenzie2018-06-051-2/+2
* Add missing tests around rendering invalid merge requests (HTML+JSON)Ash McKenzie2018-06-052-0/+26
* 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
* | | | | | | | | | Merge branch 'sh-add-uncached-query-limiter' into 'master'Rémy Coutable2018-06-056-22/+78
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove N+1 query for author in issues APIsh-add-uncached-query-limiterStan Hu2018-06-046-22/+78
* | | | | | | | | | | Merge branch '47236-print-fix' into 'master'Phil Hughes2018-06-051-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove sidebar and monitoring nav from print view47236-print-fixAnnabel Dunstone Gray2018-06-041-2/+3
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jivl-smarter-system-notes' into 'master'Phil Hughes2018-06-057-2/+759
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Support smarter system notesJose Ivan Vargas2018-06-057-2/+759
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'perform-ci-build-auth-always-on-primary-ce' into 'master'Grzegorz Bizon2018-06-051-1/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bring back the EE changes to CE to authentication of buildsperform-ci-build-auth-always-on-primary-ceKamil Trzciński2018-06-041-1/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'update_vendored_ADO_template' into 'master'Kamil Trzciński2018-06-051-10/+55
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updated vendored ADO templateupdate_vendored_ADO_templateOlivier Gonzalez2018-06-041-10/+55
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'osw-ignore-diff-header-when-persisting-diff-hunk' into 'master'Sean McGivern2018-06-054-53/+78
|\ \ \ \ \ \ \ \ \ \ \