summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update validatorpresigned-multipart-uploadsKamil Trzciński2018-06-045-39/+22
* Support presigned multipart uploadsKamil Trzciński2018-06-0415-123/+592
* Merge branch 'sh-fix-source-project-nplus-one' into 'master'47213-epics-page-styling-is-brokenSean McGivern2018-06-042-1/+6
|\
| * Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-oneStan Hu2018-06-032-1/+6
* | Merge branch 'bvl-bump-gitlab-shell-7-1-3' into 'master'Douwe Maan2018-06-042-1/+6
|\ \
| * | Bump gitlab-shell to 7.1.3bvl-bump-gitlab-shell-7-1-3Bob Van Landuyt2018-06-042-1/+6
* | | Merge branch 'ide-highlighter-type-fox' into 'master'Filipa Lacerda2018-06-041-1/+1
|\ \ \
| * | | Fixed typo in commit message help popoveride-highlighter-type-foxPhil Hughes2018-06-011-1/+1
* | | | Merge branch 'sh-fix-issue-43981' into 'master'Douwe Maan2018-06-042-22/+21
|\ \ \ \
| * | | | Fix intermittent failing spec in spec/support/helpers/cycle_analytics_helpers.rbsh-fix-issue-43981Stan Hu2018-06-022-22/+21
| | |_|/ | |/| |
* | | | Merge branch 'sh-fix-secrets-not-working' into 'master'Douwe Maan2018-06-045-12/+24
|\ \ \ \
| * | | | Fix missing key change in 20171124104327_migrate_kubernetes_service_to_new_cl...sh-fix-secrets-not-workingStan Hu2018-06-021-1/+1
| * | | | Fix attr_encryption key settingsStan Hu2018-06-024-11/+23
| |/ / /
* | | | Merge branch 'sh-add-missing-squash-param-api-docs' into 'master'Achilleas Pipinellis2018-06-041-0/+1
|\ \ \ \
| * | | | Fix missing squash parameter in doc/api/merge_requests.mdsh-add-missing-squash-param-api-docsStan Hu2018-05-301-0/+1
* | | | | Merge branch 'per-project-pipeline-iid' into 'master'Grzegorz Bizon2018-06-0423-28/+165
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix wording in spec. Add PIPELINE_IID in examples of debugged variables in do...per-project-pipeline-iidShinya Maeda2018-06-042-4/+7
| * | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-043-5/+10
| |\ \ \ \
| * | | | | Reveert build_relations and simply add a line for creating iidShinya Maeda2018-06-022-16/+10
| * | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-02260-2821/+4028
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Use shared examples for populate specShinya Maeda2018-06-012-20/+18
| * | | | | Remove unneccesary specShinya Maeda2018-06-012-15/+1
| * | | | | Clean up presence validation specShinya Maeda2018-06-012-11/+20
| * | | | | Add spec for variables expressions with pipeline iidShinya Maeda2018-06-011-13/+32
| * | | | | Fix populate_specShinya Maeda2018-06-011-3/+3
| * | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-01422-18273/+4478
| |\ \ \ \ \
| * | | | | | Add spec for variables expressionShinya Maeda2018-05-303-17/+53
| * | | | | | Add build_relations method in Chain::PopulateShinya Maeda2018-05-302-7/+13
| * | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-30266-1827/+4217
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-28942-4640/+7436
| |\ \ \ \ \ \ \
| * | | | | | | | Remvoe disable_ddl_transaction! and redandant RecordNotUnique exception rescueShinya Maeda2018-05-223-24/+7
| * | | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-22396-2172/+3606
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-17208-3860/+2447
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clarify scope for AtomicInternalId shared specShinya Maeda2018-05-146-3/+9
| * | | | | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-1478-638/+1263
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix static analysysShinya Maeda2018-05-117-9/+9
| * | | | | | | | | | | Rescue RecordNotUnique when pipeline is created with non-unique iidShinya Maeda2018-05-114-14/+35
| * | | | | | | | | | | Remove numericality as it's redandant with integer column and validates nil IIDShinya Maeda2018-05-114-3/+4
| * | | | | | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-1140-269/+359
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix ensure_iid! method override problemShinya Maeda2018-05-102-4/+4
| * | | | | | | | | | | | Fix atomic internal id spec to allow generate pipelineShinya Maeda2018-05-101-12/+7
| * | | | | | | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-10108-863/+1348
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-09132-1359/+719
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix specShinya Maeda2018-05-084-4/+14
| * | | | | | | | | | | | | | Decouple to_params from AtomicInternalId concernShinya Maeda2018-05-087-6/+15
| * | | | | | | | | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-08580-5830/+16810
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use **CI_PIPELINE_IID**Kamil Trzciński2018-05-032-2/+2
| * | | | | | | | | | | | | | | Make Atomic Internal ID work for pipelinesKamil Trzciński2018-05-033-8/+17
| * | | | | | | | | | | | | | | Add to_param override to lookup :id pathShinya Maeda2018-05-031-1/+10
| * | | | | | | | | | | | | | | Revert column name changeShinya Maeda2018-05-034-8/+8