summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '33697-pipelines-json-endpoint' into 'master'Kamil Trzciński2018-05-079-12/+220
|\
| * Rename status JSON schema to ci_detailed_statusMatija Čupić2018-05-043-2/+2
| * Fix broken tests - use the corrent event when button is clickedFilipa Lacerda2018-05-032-4/+4
| * Fix broken testFilipa Lacerda2018-05-031-1/+1
| * Add Pipeline stage, status and job JSON schemasMatija Čupić2018-05-023-0/+72
| * Merge branch 'master' into 33697-pipelines-json-endpointMatija Čupić2018-05-0248-519/+1425
| |\
| * | Align elements of the hash literal parameterMatija Čupić2018-05-021-4/+4
| * | Add stages_ajax endpoint to serve old HTMLKamil Trzciński2018-05-021-2/+37
| * | Update fixturesFilipa Lacerda2018-05-011-0/+1
| * | Merge branch 'master' into 33697-pipelines-json-endpointFilipa Lacerda2018-04-3060-502/+1041
| |\ \
| * | | Update tests with json endpointFilipa Lacerda2018-04-242-6/+106
* | | | Merge branch '4084-epics-username-autocomplete-ce' into 'master'Douwe Maan2018-05-073-0/+116
|\ \ \ \
| * | | | Backport of 4084-epics-username-autocompleteMario de la Ossa2018-05-043-0/+116
* | | | | Merge branch '44059-specify-variables-when-executing-a-manual-pipeline-from-t...Kamil Trzciński2018-05-063-7/+45
|\ \ \ \ \
| * | | | | Add pipeline variables feature specMatija Čupić2018-05-041-0/+15
| * | | | | Improve variable comparisonMatija Čupić2018-05-042-4/+4
| * | | | | Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi...Matija Čupić2018-05-026-17/+12
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Search for "Create for" in feature specMatija Čupić2018-05-021-1/+1
| * | | | | Update feature spec to search for Create pipeline buttonMatija Čupić2018-05-021-3/+3
| * | | | | Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi...Matija Čupić2018-05-0246-513/+1424
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi...Jose2018-04-30328-2187/+8295
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Extend Gitlab::Ci::Pipeline::Chain::Command with variables_attributesMatija Čupić2018-04-181-1/+7
| * | | | | | Use variables_attributes intead of variablesMatija Čupić2018-04-181-7/+7
| * | | | | | Add variables option to Ci::CreatePipelineServiceMatija Čupić2018-04-181-2/+19
* | | | | | | Merge branch '44542-move-import-specific-attributes-out-of-the-project-model-...Douwe Maan2018-05-0418-29/+249
|\ \ \ \ \ \ \
| * | | | | | | Backports every CE related change from ee-44542 to CETiago Botelho2018-05-0418-29/+249
* | | | | | | | Merge branch '46049-import-export-import-is-broken-due-to-the-addition-of-a-c...Douwe Maan2018-05-041-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | fix missing spaceJames Lopez2018-05-041-1/+1
| * | | | | | | | Add ci_cd_settings delete_all dependency on projectJames Lopez2018-05-041-0/+8
* | | | | | | | | Merge branch 'dm-webhook-catch-blocked-url-exception' into 'master'Robert Speicher2018-05-041-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Ensure web hook 'blocked URL' errors are stored in as web hook logs and prope...Douwe Maan2018-05-041-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'bvl-enforce-terms' into 'master'Douwe Maan2018-05-0422-8/+693
|\ \ \ \ \ \ \ \
| * | | | | | | | Reuses `InternalRedirect` when possibleBob Van Landuyt2018-05-042-1/+46
| * | | | | | | | Enforces terms in the web applicationBob Van Landuyt2018-05-049-1/+291
| * | | | | | | | Allow a user to accept/decline termsBob Van Landuyt2018-05-046-3/+165
| * | | | | | | | Display terms to a userBob Van Landuyt2018-05-042-0/+39
| * | | | | | | | Make the user dropdown reusableBob Van Landuyt2018-05-042-5/+38
| * | | | | | | | Add model to track users accepting agreementsBob Van Landuyt2018-05-041-0/+8
| * | | | | | | | Store application wide termsBob Van Landuyt2018-05-046-1/+109
| |/ / / / / / /
* | | | | | | | Merge branch 'replace-commits-tests-with-rspec' into 'master'Rémy Coutable2018-05-042-9/+254
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Replace commits spinach tests with RSpec analogSemyon Pupkov2018-05-042-9/+254
* | | | | | | | Merge branch 'feature/runner-per-group' into 'master'Kamil Trzciński2018-05-0412-134/+725
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Use factory in specs for ProjectCiCdSettings"Dylan Griffith2018-05-032-11/+7
| * | | | | | | | Fix Project#group_runners_enabled as it was doing nothingDylan Griffith2018-05-031-11/+17
| * | | | | | | | Use factory in specs for ProjectCiCdSettingsDylan Griffith2018-05-032-7/+11
| * | | | | | | | Remove Runner#belonging_to_any_project since this is no longer neededDylan Griffith2018-05-031-15/+0
| * | | | | | | | Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-0381-910/+2259
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Make assertions about runner_type in spec/requests/api/runner_spec.rbDylan Griffith2018-05-031-4/+9
| * | | | | | | | | Style improvements to spec/models/project_spec.rbDylan Griffith2018-05-031-2/+13
| * | | | | | | | | More style improvements to spec/models/ci/runner_spec.rbDylan Griffith2018-05-031-41/+40