summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-0745-50/+658
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | / / / / / / / / / | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the implied CI/CD config for AutoDevOps Closes #34777 See merge request !13923
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-09-07169-1041/+2088
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | | | | | | | | | | | | | | | Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-0789-251/+1909
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix ordering of columns on new tableZeger-Jan van de Weg2017-09-072-11/+6
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2017-09-06222-1668/+5831
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | | | | | | | | | | | | | | | | Add tests to cover all introduced changesKamil Trzcinski2017-09-068-28/+221
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Implement `Project#has_ci?`Kamil Trzcinski2017-09-062-1/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Improve config source handling codeKamil Trzcinski2017-09-065-21/+33
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-06507-5560/+15605
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Use hook for setting Pipeline config_sourceZeger-Jan van de Weg2017-09-066-20/+32
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Incorporate another round of feedbackZeger-Jan van de Weg2017-09-066-38/+60
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix boolean logic with nil valueZeger-Jan van de Weg2017-09-041-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'zj-auto-devops-table' of gitlab.com:zj/gitlab-ce into ↵Zeger-Jan van de Weg2017-09-042-28/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zj-auto-devops-table
| | * | | | | | | | | | | | | | | | | | Updates settings sections to:Filipa Lacerda2017-09-041-28/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - create labels for each radio button - remove elements from form section - visually match the mockups
| | * | | | | | | | | | | | | | | | | | Adds documentation path to pipelines table in merge request pageFilipa Lacerda2017-09-041-0/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Incorporate reviewZeger-Jan van de Weg2017-09-0411-22/+44
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge branch 'zj-auto-devops-table' of gitlab.com:zj/gitlab-ce into ↵Zeger-Jan van de Weg2017-09-045-26/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zj-auto-devops-table
| | * | | | | | | | | | | | | | | | | | Accomodate several tags in one cellFilipa Lacerda2017-09-013-3/+15
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Improves popover to show on focusFilipa Lacerda2017-09-014-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS improvements after review
| | * | | | | | | | | | | | | | | | | | Fix documention pathFilipa Lacerda2017-09-011-1/+1
| | | |_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-04400-1944/+10622
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix testsZeger-Jan van de Weg2017-09-047-5/+25
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Adds documentation link to the autodevops popoverFilipa Lacerda2017-09-0112-3/+42
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Adds tooltip for Auto DevOps badge in pipeline tableFilipa Lacerda2017-09-015-25/+92
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix db/schema.rb not being up to dateZeger-Jan van de Weg2017-08-311-3/+16
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add config_source to ci_pipelinesZeger-Jan van de Weg2017-08-318-28/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the user can soon have multiple config sources for CI, we now store what type at the time of the pipeline run we chose. This will give us insight into what triggered the new pipeline so we can display it to the enduser.
| * | | | | | | | | | | | | | | | | | Form for setting project auto devops settingsZeger-Jan van de Weg2017-08-319-19/+62
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Implement the implied CI/CD config for AutoDevOpsZeger-Jan van de Weg2017-08-3115-18/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Behind an application setting, which defaults to false, this commit implements the implied CI/CD config. Which means that in the case we can't find the `.gitlab-ci.yml` on the commit we want to start a pipeline for, we fall back to an implied configuration. For now the Bash template has been copied to `Auto-Devops.gitlab-ci.yml` so the tests actually work. Fixes #34777
* | | | | | | | | | | | | | | | | | | Merge branch '31362_decrease_cyclomatic_complexity_threshold_step3' into ↵Rémy Coutable2017-09-076-28/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Decrease Cyclomatic Complexity threshold to 14 See merge request !13972
| * | | | | | | | | | | | | | | | | | | remove unnecessary args from `link_to_member_avatar` method in ↵Maxim Rydkin2017-09-072-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `app/helpers/projects_helper.rb`
| * | | | | | | | | | | | | | | | | | | refactor Ci::CreatePipelineService#allowed_to_create?Maxim Rydkin2017-09-071-9/+9
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | fix project_helper.rb and add couple specs to itMaxim Rydkin2017-09-072-5/+19
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | fix CIMaxim Rydkin2017-09-072-2/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | refactor app/services/ci/create_pipeline_service.rb:50:5Maxim Rydkin2017-09-071-12/+14
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | fix helper and specMaxim Rydkin2017-09-072-6/+13
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | adds changelogMaxim Rydkin2017-09-071-0/+5
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | refactor `app/helpers/projects_helper.rb:21:3`Maxim Rydkin2017-09-073-4/+12
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-0738-53/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558
| * | | | | | | | | | | | | | | | | | | | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-0738-53/+67
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '37513-projects-dropdown-copy-tweaks' into 'master'Tim Zallmann2017-09-075-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change strings for projects dropdown placeholder and error state Closes #37513 See merge request !14079
| * | | | | | | | | | | | | | | | | | | Change strings for projects dropdown placeholder and error state37513-projects-dropdown-copy-tweaksChris Peressini2017-09-075-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-ce#37513
* | | | | | | | | | | | | | | | | | | | Merge branch '37368-blob-viewer-on-mobile' into 'master'Annabel Dunstone Gray2017-09-072-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make blob viewer wider for mobile Closes #37368 See merge request !14011
| * | | | | | | | | | | | | | | | | | | Make blob viewer for rich contents wider for mobileTakuya Noguchi2017-09-022-2/+9
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch ↵Sean McGivern2017-09-0733-111/+648
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| * | | | | | | | | | | | | | | | | | | | Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-paletteRuben Davila2017-09-073-10/+8
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Use indigo as default themeAnnabel Dunstone Gray2017-09-073-4/+4
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add changelogAnnabel Dunstone Gray2017-09-061-0/+5
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Finish light themeAnnabel Dunstone Gray2017-09-062-13/+78
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add previews in preferencesAnnabel Dunstone Gray2017-09-064-4/+75
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix specs; start on light themeAnnabel Dunstone Gray2017-09-068-34/+67
| | | | | | | | | | | | | | | | | | | | |