summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-omniauth-saml' into 'master'Douwe Maan2018-03-192-2/+2
|\
| * Relax omniauth-samlPirate Praveen2018-03-152-2/+2
* | Merge branch '31114-internal-ids-are-not-atomic' into 'master'Sean McGivern2018-03-1919-8/+383
|\ \
| * | Add spec for concurrent insert situation.31114-internal-ids-are-not-atomicAndreas Brandl2018-03-181-0/+13
| * | Replace public_send calls.Andreas Brandl2018-03-181-3/+3
| * | Address review comments.Andreas Brandl2018-03-166-19/+22
| * | Only support single scope argument.Andreas Brandl2018-03-161-4/+2
| * | Simplify migration and add NOT NULL to project_id.Andreas Brandl2018-03-162-20/+4
| * | Address review comments.Andreas Brandl2018-03-162-17/+15
| * | Add new model to import/export configuration.Andreas Brandl2018-03-161-0/+1
| * | Add shared specs for AtomicInternalId concern.Andreas Brandl2018-03-163-2/+46
| * | Backwards-compat for migration specs.Andreas Brandl2018-03-162-4/+35
| * | Add changelog.Andreas Brandl2018-03-161-0/+5
| * | Use bigserial for internal_ids table.Andreas Brandl2018-03-162-2/+2
| * | Add bigserial as a native database type for MySQL adapterDouglas Barbosa Alexandre2018-03-161-0/+11
| * | Refactor, extract class and improve comments.Andreas Brandl2018-03-165-43/+95
| * | More flexible way of internal id generation.Andreas Brandl2018-03-165-49/+42
| * | Atomic generation of internal ids for issues.Andreas Brandl2018-03-168-1/+243
| * | Deprecate InternalId concern and rename.Andreas Brandl2018-03-166-6/+6
* | | Merge branch 'abuango-cloud-native' into 'master'Achilleas Pipinellis2018-03-191-1/+1
|\ \ \
| * | | Added Video explaining Cloud native GitLab Chartabuango-cloud-nativeAbubakar Ango2018-03-191-1/+1
* | | | Merge branch '44257-viewing-a-particular-commit-gives-500-error-error-undefin...Douwe Maan2018-03-193-18/+38
|\ \ \ \
| * | | | Ensure that we never assume old_blob or new_blob are nil44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binarySean McGivern2018-03-163-18/+38
* | | | | Merge branch '44022-singular-1-diff' into 'master'Sean McGivern2018-03-193-2/+63
|\ \ \ \ \
| * | | | | Resolve "GitLab Community Edition 10.5.3 shows plural for 1 item"Jan2018-03-193-2/+63
|/ / / / /
* | | | | Merge branch 'fl-update-svgs' into 'master'Phil Hughes2018-03-192-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Updates svg dependencyFilipa Lacerda2018-03-192-4/+4
* | | | | Merge branch 'le-issue-boards-height-calculation' into 'master'Phil Hughes2018-03-194-61/+80
|\ \ \ \ \
| * | | | | Make issue boards height calculation clearer and remove magic numbersLukas Eipert2018-03-194-61/+80
|/ / / / /
* | | | | Merge branch 'tc-package-qa-rename-docs' into 'master'Grzegorz Bizon2018-03-193-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename `package-qa` in docsToon Claes2018-03-193-3/+3
|/ / / /
* | | | Merge branch 'update-gitlab-ci-yml-services-docs' into 'master'Achilleas Pipinellis2018-03-192-1/+67
|\ \ \ \
| * | | | Copyedit CI services docsAchilleas Pipinellis2018-03-191-56/+33
| * | | | Add CHANGELOG entryupdate-gitlab-ci-yml-services-docsTomasz Maczukin2018-03-141-0/+5
| * | | | Update CI services documnetationTomasz Maczukin2018-03-141-0/+84
* | | | | Merge branch 'update-kubeclient' into 'master'Grzegorz Bizon2018-03-1912-22/+23
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-17233-3409/+5755
| |\ \ \ \ \
| * | | | | | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)Pirate Praveen2018-03-1510-10/+10
| * | | | | | Update kubeclient 2.2.0 -> 3.0Pirate Praveen2018-03-142-12/+12
* | | | | | | Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' i...Mike Greiling2018-03-195-32/+43
|\ \ \ \ \ \ \
| * | | | | | | Move UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-085-32/+43
* | | | | | | | Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'Kamil TrzciƄski2018-03-186-7/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix specfix/sm/clarify-ambiguous-with_artifacts-implicationShinya Maeda2018-03-161-1/+1
| * | | | | | | | Use with_artifacts_archive name. Add specShinya Maeda2018-03-154-6/+42
| * | | | | | | | Fix corrupted testShinya Maeda2018-03-151-1/+1
| * | | | | | | | Add feartue spec. Fix failed testShinya Maeda2018-03-152-1/+13
| * | | | | | | | Add rubocop:disable GitlabSecurity/PublicSendShinya Maeda2018-03-151-1/+1
| * | | | | | | | Clarify ambiguous with_artifacts implicationShinya Maeda2018-03-153-6/+6
* | | | | | | | | Merge branch 'fix-dropzone-project-show' into 'master'Jacob Schatz2018-03-183-4/+44
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix dropzone project showClement Ho2018-03-183-4/+44
|/ / / / / / / /