summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update rails template to include postgreszj-update-rails-templateZeger-Jan van de Weg2017-09-072-0/+5
* Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-0745-50/+658
|\
| * Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-07169-1041/+2088
| |\
| * \ 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 zj/gitlab-ce-zj...Kamil Trzcinski2017-09-06222-1668/+5831
| |\ \ \
| * | | | 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 zj-auto-d...Zeger-Jan van de Weg2017-09-042-28/+26
| |\ \ \ \ \
| | * | | | | Updates settings sections to:Filipa Lacerda2017-09-041-28/+25
| | * | | | | 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 zj-auto-d...Zeger-Jan van de Weg2017-09-045-26/+29
| |\ \ \ \ \
| | * | | | | Accomodate several tags in one cellFilipa Lacerda2017-09-013-3/+15
| | * | | | | Improves popover to show on focusFilipa Lacerda2017-09-014-24/+15
| | * | | | | 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
| * | | | | | 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
* | | | | | | Merge branch '31362_decrease_cyclomatic_complexity_threshold_step3' into 'mas...Rémy Coutable2017-09-076-28/+60
|\ \ \ \ \ \ \
| * | | | | | | remove unnecessary args from `link_to_member_avatar` method in `app/helpers/p...Maxim Rydkin2017-09-072-9/+5
| * | | | | | | 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 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 state37513-projects-dropdown-copy-tweaksChris Peressini2017-09-075-4/+22
* | | | | | | | | | Merge branch '37368-blob-viewer-on-mobile' into 'master'Annabel Dunstone Gray2017-09-072-2/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Make blob viewer for rich contents wider for mobileTakuya Noguchi2017-09-022-2/+9
* | | | | | | | | | Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-0733-111/+648
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
View Lorry Controller Status