Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clean up projects API docsdocs/cleanup-projects-api | Achilleas Pipinellis | 2017-09-06 | 1 | -187/+40 |
| | |||||
* | Merge branch 'feature/gb/kubernetes-only-pipeline-jobs' into 'master' | Kamil Trzciński | 2017-09-04 | 12 | -40/+210 |
|\ | | | | | | | | | | | | | Check if Kubernetes is required when creating pipeline jobs Closes #34785 See merge request !13849 | ||||
| * | Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobs | Grzegorz Bizon | 2017-09-04 | 567 | -2797/+12761 |
| |\ | | | | | | | | | | * master: (469 commits) | ||||
| * | | Fix rubocop offense in CI/CD YAML processor specsfeature/gb/kubernetes-only-pipeline-jobs | Grzegorz Bizon | 2017-09-04 | 1 | -2/+5 |
| | | | |||||
| * | | Remove an empty line from YAML processor class | Grzegorz Bizon | 2017-09-01 | 1 | -1/+0 |
| | | | |||||
| * | | Fix only/except docs disclaimer's markdown | Grzegorz Bizon | 2017-09-01 | 1 | -0/+1 |
| | | | |||||
| * | | Copy-edit kubernetes: active feature docs | Grzegorz Bizon | 2017-09-01 | 1 | -4/+5 |
| | | | |||||
| * | | Add disclaimer about alpha kubernetes: active feature | Grzegorz Bizon | 2017-09-01 | 1 | -0/+1 |
| | | | |||||
| * | | Add some basic docs about kubernetes: active feature | Grzegorz Bizon | 2017-09-01 | 1 | -4/+31 |
| | | | |||||
| * | | Add changelog entry for kubernetes: active job policy | Grzegorz Bizon | 2017-09-01 | 1 | -0/+5 |
| | | | |||||
| * | | Change CI/CD kubernetes policy keyword to `active` | Grzegorz Bizon | 2017-09-01 | 4 | -16/+10 |
| | | | |||||
| * | | Check if service active when using CI/CD kubernetes policy | Grzegorz Bizon | 2017-09-01 | 3 | -44/+9 |
| | | | |||||
| * | | Fix only/except policy CI/CD linter | Grzegorz Bizon | 2017-08-31 | 2 | -4/+4 |
| | | | |||||
| * | | Change kubernetes job policy allowed values | Grzegorz Bizon | 2017-08-31 | 5 | -5/+56 |
| | | | | | | | | | | | | It is now possible to use `kubernetes: configured`. | ||||
| * | | Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobs | Grzegorz Bizon | 2017-08-31 | 645 | -4483/+10025 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (275 commits) Decrease Metrics/PerceivedComplexity threshold to 17 Upgrade mail and nokogiri gems due to security issues Link out to stackoverflow answer on setting swappiness Document swappiness recomendations in the requirements doc Fix invalid attribute used for time-ago-tooltip component Update latest artifacts doc Add changelog entry for flipping verify_certificates Default LDAP config verify_certificates to true Update share project with groups docs remove accidental console.log from karma tests update specs to match reorganized monitoring components Remove tooltips from new sidebar Use `git update-ref --stdin -z` to delete refs Don't use public_send in destroy_conditionally! helper Remove unused expressions policy from ci/cd config Simplify code for appending strategies in CI/CD config Raise exception when simplifiable ci entry incomplete Add changelog entry Fix MySQL failure for emoji autocomplete max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) ... Conflicts: lib/gitlab/ci/config/entry/policy.rb | ||||
| * | | | Make some methods in CI/CD YAML processor private | Grzegorz Bizon | 2017-08-31 | 1 | -27/+29 |
| | | | | |||||
| * | | | Improve matching kubernetes job in CI/CD processor | Grzegorz Bizon | 2017-08-31 | 1 | -3/+3 |
| | | | | |||||
| * | | | Remove unused method from CI/CD YAML processor | Grzegorz Bizon | 2017-08-31 | 2 | -7/+1 |
| | | | | |||||
| * | | | Refactor context variables in pipeline model class | Grzegorz Bizon | 2017-08-31 | 2 | -18/+14 |
| | | | | |||||
| * | | | Check if kubernetes required before creating a job | Grzegorz Bizon | 2017-08-26 | 5 | -8/+112 |
| | | | | |||||
| * | | | Improve kubernetes service specs readability | Grzegorz Bizon | 2017-08-26 | 1 | -9/+4 |
| | | | | |||||
| * | | | Make it possible to access deployment details from pipeline | Grzegorz Bizon | 2017-08-26 | 2 | -0/+9 |
| | | | | |||||
| * | | | Use new complex only/except policy internal scheme | Grzegorz Bizon | 2017-08-26 | 3 | -3/+7 |
| | | | | |||||
* | | | | Merge branch 'feature-highlight' into 'master' | Phil Hughes | 2017-09-04 | 13 | -7/+735 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature highlight to Issue Boards in new navigation sidebar Closes #36760 See merge request !13515 | ||||
| * | | | | Add feature highlight to Issue Boards in new navigation sidebar | Clement Ho | 2017-09-04 | 13 | -7/+735 |
|/ / / / | |||||
* | | | | Merge branch 'remove-unused-code-issueshelper' into 'master' | Rémy Coutable | 2017-09-04 | 3 | -45/+0 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove unused methods from `IssuesHelper` and `IssuablesHelper` See merge request !13793 | ||||
| * | | | | Remove unused `IssuesHelper#merge_requests_sentence` | Mehdi Lahmam | 2017-08-24 | 2 | -18/+0 |
| | | | | | | | | | | | | | | | | | | | | Its last usage has been removed at eb3e7bdfd8. | ||||
| * | | | | Removed unused `IssuablesHelper#issuable_state_scope` | Mehdi Lahmam | 2017-08-24 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | Its last usage has been removed at 260c8da060. | ||||
| * | | | | Remove unused `IssuesHelper#due_date_options` | Mehdi Lahmam | 2017-08-24 | 1 | -12/+0 |
| | | | | | | | | | | | | | | | | | | | | Its last usage has been removed at 05523b5bd1. | ||||
| * | | | | Remove unused `IssuesHelper#bulk_update_milestone_options` | Mehdi Lahmam | 2017-08-24 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | | | | | Its last usage has been removed at 2e3c082f2a. | ||||
* | | | | | Merge branch 'move-git-operation-service' into 'master' | Sean McGivern | 2017-09-04 | 9 | -192/+196 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move GitOperationService to Gitlab::Git See merge request !13984 | ||||
| * | | | | | Move GitOperationService to Gitlab::Gitmove-git-operation-service | Jacob Vosmaer | 2017-09-01 | 9 | -192/+196 |
| | | | | | | |||||
* | | | | | | Merge branch 'remove-unused-code' into 'master' | Rémy Coutable | 2017-09-04 | 2 | -10/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused code See merge request !13657 | ||||
| * | | | | | | Remove unused `Project#new_default_branch` attr_accessor | Mehdi Lahmam | 2017-08-20 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been introduced at 9d14c5137a but never used. | ||||
| * | | | | | | Remove unused `User#projects_limit_percent` | Mehdi Lahmam | 2017-08-20 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its last usage has been removed at 87ffd67617. | ||||
| * | | | | | | Remove `User#projects_sorted_by_activity` | Mehdi Lahmam | 2017-08-20 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its last usage has been removed at https://gitlab.com/mehlah/gitlab-ce/commit/9df6f7bfad#e6ff2c1091173fd03646752d4e30891f66d33db3_46_48 The method can still be useful but should be renamed `authorized_projects_sorted_by_activity` for better clarity. | ||||
* | | | | | | | Merge branch 'git-operation-service-to-git' into 'master' | Sean McGivern | 2017-09-04 | 9 | -138/+187 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Prepare GitOperationService for moving to Gitlab::Git See merge request !13773 | ||||
| * | | | | | | Fix whitespacegit-operation-service-to-git | Jacob Vosmaer | 2017-09-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Remove empty line | Jacob Vosmaer | 2017-09-01 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Restore with_branch cache spec | Jacob Vosmaer | 2017-09-01 | 1 | -0/+18 |
| | | | | | | | |||||
| * | | | | | | Remove YAGNI Gitaly logs from CI artifacts | Jacob Vosmaer | 2017-09-01 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Add Gitlab::Git::Repository#== | Jacob Vosmaer | 2017-09-01 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Gitaly CI improvements | Jacob Vosmaer | 2017-08-31 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Prepare GitOperationService for move to Gitlab::Git | Jacob Vosmaer | 2017-08-31 | 8 | -152/+179 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'bvl-only-require-po-parser-in-rake' into 'master' | Douwe Maan | 2017-09-04 | 3 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only require `simple_po_parser` in rake task that needs it Closes #37379 See merge request !14018 | ||||
| * | | | | | | Only require `simple_po_parser` in rake task that needs itbvl-only-require-po-parser-in-rake | Bob Van Landuyt | 2017-09-04 | 3 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way we don't need to install it in production, since it's really not needed there. | ||||
* | | | | | | | Merge branch '36452-milestone-icon' into 'master' | Phil Hughes | 2017-09-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new MR icon for milestone sidebar Closes #36452 See merge request !14004 | ||||
| * | | | | | | | Use new MR icon for milestone sidebar36452-milestone-icon | Annabel Dunstone Gray | 2017-09-01 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'winh-pikaday-dropdowns' into 'master' | Phil Hughes | 2017-09-04 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Pikaday dropdowns style consistent See merge request !13426 | ||||
| * | | | | | | | | Make Pikaday dropdowns style consistent | winh | 2017-08-09 | 1 | -2/+2 |
| | | | | | | | | |