Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '33697-pipelines-json-endpoint' into 'master' | Kamil Trzciński | 2018-05-07 | 9 | -12/+220 |
|\ | |||||
| * | Rename status JSON schema to ci_detailed_status | Matija Čupić | 2018-05-04 | 3 | -2/+2 |
| * | Fix broken tests - use the corrent event when button is clicked | Filipa Lacerda | 2018-05-03 | 2 | -4/+4 |
| * | Fix broken test | Filipa Lacerda | 2018-05-03 | 1 | -1/+1 |
| * | Add Pipeline stage, status and job JSON schemas | Matija Čupić | 2018-05-02 | 3 | -0/+72 |
| * | Merge branch 'master' into 33697-pipelines-json-endpoint | Matija Čupić | 2018-05-02 | 48 | -519/+1425 |
| |\ | |||||
| * | | Align elements of the hash literal parameter | Matija Čupić | 2018-05-02 | 1 | -4/+4 |
| * | | Add stages_ajax endpoint to serve old HTML | Kamil Trzciński | 2018-05-02 | 1 | -2/+37 |
| * | | Update fixtures | Filipa Lacerda | 2018-05-01 | 1 | -0/+1 |
| * | | Merge branch 'master' into 33697-pipelines-json-endpoint | Filipa Lacerda | 2018-04-30 | 60 | -502/+1041 |
| |\ \ | |||||
| * | | | Update tests with json endpoint | Filipa Lacerda | 2018-04-24 | 2 | -6/+106 |
* | | | | Merge branch '4084-epics-username-autocomplete-ce' into 'master' | Douwe Maan | 2018-05-07 | 3 | -0/+116 |
|\ \ \ \ | |||||
| * | | | | Backport of 4084-epics-username-autocomplete | Mario de la Ossa | 2018-05-04 | 3 | -0/+116 |
* | | | | | Merge branch '44059-specify-variables-when-executing-a-manual-pipeline-from-t... | Kamil Trzciński | 2018-05-06 | 3 | -7/+45 |
|\ \ \ \ \ | |||||
| * | | | | | Add pipeline variables feature spec | Matija Čupić | 2018-05-04 | 1 | -0/+15 |
| * | | | | | Improve variable comparison | Matija Čupić | 2018-05-04 | 2 | -4/+4 |
| * | | | | | Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi... | Matija Čupić | 2018-05-02 | 6 | -17/+12 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Search for "Create for" in feature spec | Matija Čupić | 2018-05-02 | 1 | -1/+1 |
| * | | | | | Update feature spec to search for Create pipeline button | Matija Čupić | 2018-05-02 | 1 | -3/+3 |
| * | | | | | Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi... | Matija Čupić | 2018-05-02 | 46 | -513/+1424 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi... | Jose | 2018-04-30 | 328 | -2187/+8295 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Extend Gitlab::Ci::Pipeline::Chain::Command with variables_attributes | Matija Čupić | 2018-04-18 | 1 | -1/+7 |
| * | | | | | | Use variables_attributes intead of variables | Matija Čupić | 2018-04-18 | 1 | -7/+7 |
| * | | | | | | Add variables option to Ci::CreatePipelineService | Matija Čupić | 2018-04-18 | 1 | -2/+19 |
* | | | | | | | Merge branch '44542-move-import-specific-attributes-out-of-the-project-model-... | Douwe Maan | 2018-05-04 | 18 | -29/+249 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Backports every CE related change from ee-44542 to CE | Tiago Botelho | 2018-05-04 | 18 | -29/+249 |
* | | | | | | | | Merge branch '46049-import-export-import-is-broken-due-to-the-addition-of-a-c... | Douwe Maan | 2018-05-04 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix missing space | James Lopez | 2018-05-04 | 1 | -1/+1 |
| * | | | | | | | | Add ci_cd_settings delete_all dependency on project | James Lopez | 2018-05-04 | 1 | -0/+8 |
* | | | | | | | | | Merge branch 'dm-webhook-catch-blocked-url-exception' into 'master' | Robert Speicher | 2018-05-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Ensure web hook 'blocked URL' errors are stored in as web hook logs and prope... | Douwe Maan | 2018-05-04 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'bvl-enforce-terms' into 'master' | Douwe Maan | 2018-05-04 | 22 | -8/+693 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Reuses `InternalRedirect` when possible | Bob Van Landuyt | 2018-05-04 | 2 | -1/+46 |
| * | | | | | | | | Enforces terms in the web application | Bob Van Landuyt | 2018-05-04 | 9 | -1/+291 |
| * | | | | | | | | Allow a user to accept/decline terms | Bob Van Landuyt | 2018-05-04 | 6 | -3/+165 |
| * | | | | | | | | Display terms to a user | Bob Van Landuyt | 2018-05-04 | 2 | -0/+39 |
| * | | | | | | | | Make the user dropdown reusable | Bob Van Landuyt | 2018-05-04 | 2 | -5/+38 |
| * | | | | | | | | Add model to track users accepting agreements | Bob Van Landuyt | 2018-05-04 | 1 | -0/+8 |
| * | | | | | | | | Store application wide terms | Bob Van Landuyt | 2018-05-04 | 6 | -1/+109 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'replace-commits-tests-with-rspec' into 'master' | Rémy Coutable | 2018-05-04 | 2 | -9/+254 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Replace commits spinach tests with RSpec analog | Semyon Pupkov | 2018-05-04 | 2 | -9/+254 |
* | | | | | | | | Merge branch 'feature/runner-per-group' into 'master' | Kamil Trzciński | 2018-05-04 | 12 | -134/+725 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "Use factory in specs for ProjectCiCdSettings" | Dylan Griffith | 2018-05-03 | 2 | -11/+7 |
| * | | | | | | | | Fix Project#group_runners_enabled as it was doing nothing | Dylan Griffith | 2018-05-03 | 1 | -11/+17 |
| * | | | | | | | | Use factory in specs for ProjectCiCdSettings | Dylan Griffith | 2018-05-03 | 2 | -7/+11 |
| * | | | | | | | | Remove Runner#belonging_to_any_project since this is no longer needed | Dylan Griffith | 2018-05-03 | 1 | -15/+0 |
| * | | | | | | | | Merge branch 'master' into feature/runner-per-group | Dylan Griffith | 2018-05-03 | 81 | -910/+2259 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make assertions about runner_type in spec/requests/api/runner_spec.rb | Dylan Griffith | 2018-05-03 | 1 | -4/+9 |
| * | | | | | | | | | Style improvements to spec/models/project_spec.rb | Dylan Griffith | 2018-05-03 | 1 | -2/+13 |
| * | | | | | | | | | More style improvements to spec/models/ci/runner_spec.rb | Dylan Griffith | 2018-05-03 | 1 | -41/+40 |