Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix a typo, a conflict and improve documentationissue_38337 | Felipe Artur | 2018-03-06 | 3 | -2/+5 |
| | |||||
* | Address review comments | Felipe Artur | 2018-03-05 | 9 | -47/+31 |
| | |||||
* | Bring one group board to CE | Felipe Artur | 2018-03-03 | 66 | -469/+1744 |
| | |||||
* | Merge branch 'remove-test-bundle' into 'master' | Clement Ho | 2018-03-02 | 4 | -5/+5 |
|\ | | | | | | | | | Remove the "test" bundle and apply it conditionally within main.js See merge request gitlab-org/gitlab-ce!17472 | ||||
| * | remove the "test" bundle and apply it conditionally within main.jsremove-test-bundle | Mike Greiling | 2018-03-01 | 4 | -5/+5 |
| | | |||||
* | | Merge branch '41905_merge_request_and_issue_metrics' into 'master' | Sean McGivern | 2018-03-02 | 5 | -17/+118 |
|\ \ | | | | | | | | | | | | | | | | | | | expose metrics in merge request api Closes #41905 See merge request gitlab-org/gitlab-ce!16589 | ||||
| * | | expose metrics in merge request api | haseeb | 2018-03-02 | 5 | -17/+118 |
|/ / | |||||
* | | Merge branch 'two_factor_auth_webpack_bundle_tag_refactor' into 'master' | Clement Ho | 2018-03-02 | 3 | -6/+1 |
|\ \ | | | | | | | | | | | | | Removes webpack bundle tag for two factor auth js See merge request gitlab-org/gitlab-ce!17330 | ||||
| * | | remove two_factor_auth bundletwo_factor_auth_webpack_bundle_tag_refactor | Mike Greiling | 2018-03-01 | 3 | -6/+1 |
| |/ | |||||
* | | Merge branch 'refactor-protected-branches' into 'master' | Jacob Schatz | 2018-03-02 | 4 | -13/+4 |
|\ \ | | | | | | | | | | | | | Remove protected branches webpack bundle tag See merge request gitlab-org/gitlab-ce!17374 | ||||
| * | | Remove protected branches webpack bundle tag | Clement Ho | 2018-03-02 | 4 | -13/+4 |
|/ / | |||||
* | | Merge branch '33570-slack-notify-default-branch' into 'master' | Sean McGivern | 2018-03-02 | 3 | -3/+32 |
|\ \ | | | | | | | | | | | | | | | | | | | Slack notifications - Respect "Notify only default branch" for push events Closes #33570 See merge request gitlab-org/gitlab-ce!17345 | ||||
| * | | SlackService - respect `notify_only_default_branch` for push events | Mario de la Ossa | 2018-03-02 | 3 | -3/+32 |
| | | | |||||
* | | | Merge branch 'docs-incoming-email-ce' into 'master' | Marcia Ramos | 2018-03-02 | 8 | -361/+436 |
|\ \ \ | | | | | | | | | | | | | | | | | Update incoming emails documents See merge request gitlab-org/gitlab-ce!17481 | ||||
| * | | | Update incoming emails documentsdocs-incoming-email-ce | Lin Jen-Shin | 2018-03-02 | 8 | -361/+436 |
| | | | | |||||
* | | | | Merge branch ↵ | Sean McGivern | 2018-03-02 | 1 | -7/+7 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | '43548-update-language-about-usage-ping-in-admin-settings-and-docs' into 'master' Resolve "Update language about usage ping in admin settings" Closes #43548 See merge request gitlab-org/gitlab-ce!17468 | ||||
| * | | | Clarify usage ping wording in admin area | Sean McGivern | 2018-03-02 | 1 | -7/+7 |
| | | | | |||||
* | | | | Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master' | Sean McGivern | 2018-03-02 | 12 | -101/+193 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch commit signatures from Gitaly in batches Closes gitaly#1046 See merge request gitlab-org/gitlab-ce!17456 | ||||
| * | | | | Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batch | Ahmad Sherif | 2018-03-01 | 12 | -101/+193 |
| | | | | | | | | | | | | | | | | | | | | Closes gitaly#1046 | ||||
* | | | | | Merge branch 'jprovazn-ancestor-labels' into 'master' | Grzegorz Bizon | 2018-03-02 | 5 | -7/+70 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Support additional LabelsFinder parameters for group labels See merge request gitlab-org/gitlab-ce!17447 | ||||
| * | | | | | Allow to include also descendant group labels | Jan Provaznik | 2018-03-02 | 4 | -11/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because epic index page includes also epics from subgroups it's necessary to also get descendant group labels for filtering. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4773#note_61236542 | ||||
| * | | | | | Support additional LabelsFinder parameters for group labels | Jan Provaznik | 2018-03-02 | 3 | -2/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some situations (listing labels for epics) we want to list only group ancestor labels, this is already supported in LabelsFinder we just need to enable additional parameters. Also `set_issuables_index` method now loads project labels only if @project is set (which is not used for epic group labels). | ||||
* | | | | | | Merge branch 'zj-version-string-grouping-ci' into 'master' | Grzegorz Bizon | 2018-03-02 | 4 | -3/+11 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | Allow CI/CD Jobs being grouped on version strings See merge request gitlab-org/gitlab-ce!17455 | ||||
| * | | | | | Update docs on grouping CI jobs | Zeger-Jan van de Weg | 2018-03-02 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Allow CI/CD Jobs being grouped on version strings | Zeger-Jan van de Weg | 2018-03-01 | 3 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes grouping on version number available. In general I'd like to group based on MAJOR.MINOR version numbers for Gitaly. | ||||
* | | | | | | Merge branch 'an/log-documentation' into 'master' | Stan Hu | 2018-03-02 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation WRT to request parameters See merge request gitlab-org/gitlab-ce!17469 | ||||
| * | | | | | | Update documentation WRT to request parametersan/log-documentation | Andrew Newdigate | 2018-03-01 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch '32831-single-deploy-of-runner-in-k8s-cluster' into 'master' | Kamil Trzciński | 2018-03-01 | 35 | -411/+758 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend Cluster Applications to install GitLab Runner to Kubernetes cluster Closes #32831 See merge request gitlab-org/gitlab-ce!17134 | ||||
| * | | | | | | | Extend Cluster Applications to install GitLab Runner to Kubernetes cluster | Mayra Cabrera | 2018-03-01 | 35 | -411/+758 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'webpack-registry' into 'master' | Jacob Schatz | 2018-03-01 | 4 | -4/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove registry list webpack entry point See merge request gitlab-org/gitlab-ce!17459 | ||||
| * | | | | | | | Remove registry list webpack entry point | Clement Ho | 2018-03-01 | 4 | -4/+5 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'sh-remove-trailing-lines' into 'master' | Jacob Schatz | 2018-03-01 | 2 | -2/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing newline that was causing an EE conflict See merge request gitlab-org/gitlab-ce!17465 | ||||
| * | | | | | | | Remove trailing newline that was causing an EE conflict | Stan Hu | 2018-03-01 | 2 | -2/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'bvl-add-missing-externalized-strings' into 'master' | Douwe Maan | 2018-03-01 | 1 | -26/+148 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some strings that were missing in gitlab.pot See merge request gitlab-org/gitlab-ce!17467 | ||||
| * | | | | | | | Add some strings that were missing in gitlab.potbvl-add-missing-externalized-strings | Bob Van Landuyt | 2018-03-01 | 1 | -26/+148 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'winh-fix-vuex-docs' into 'master' | Filipa Lacerda | 2018-03-01 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Small fixes in Vuex docs See merge request gitlab-org/gitlab-ce!17471 | ||||
| * | | | | | | | Small fixes in Vuex docswinh-fix-vuex-docs | Winnie Hellmann | 2018-03-01 | 1 | -4/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'remove-u2f-bundle' into 'master' | Jacob Schatz | 2018-03-01 | 14 | -99/+118 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove u2f webpack bundle See merge request gitlab-org/gitlab-ce!17435 | ||||
| * | | | | | | | Remove u2f webpack bundle | Mike Greiling | 2018-03-01 | 14 | -99/+118 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'remove-blob-viewer-bundles' into 'master' | Phil Hughes | 2018-03-01 | 13 | -49/+42 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove blob viewer bundles See merge request gitlab-org/gitlab-ce!17446 | ||||
| * | | | | | | | remove common_vue CommonsChunk config | Mike Greiling | 2018-03-01 | 1 | -14/+0 |
| | | | | | | | | |||||
| * | | | | | | | migrate stl_viewer to dynamic import | Mike Greiling | 2018-03-01 | 4 | -6/+5 |
| | | | | | | | | |||||
| * | | | | | | | migrate sketch_viewer to dynamic import | Mike Greiling | 2018-03-01 | 4 | -7/+5 |
| | | | | | | | | |||||
| * | | | | | | | migrate pdf_viewer to dynamic import | Mike Greiling | 2018-03-01 | 4 | -7/+4 |
| | | | | | | | | |||||
| * | | | | | | | migrate notebook_viewer to dynamic import | Mike Greiling | 2018-03-01 | 4 | -7/+4 |
| | | | | | | | | |||||
| * | | | | | | | migrate balsamiq_viewer to dynamic import | Mike Greiling | 2018-03-01 | 5 | -8/+24 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master' | Douwe Maan | 2018-03-01 | 73 | -1911/+1944 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359 | ||||
| * | | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth | Horatiu Eugen Vlad | 2018-02-28 | 73 | -1911/+1944 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '41777-include-cycle-time-in-usage-ping' into 'master' | Douwe Maan | 2018-03-01 | 28 | -134/+498 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Include cycle time in usage ping" Closes #41777 See merge request gitlab-org/gitlab-ce!16793 | ||||
| * | | | | | | | | Adapt cycle analytics spec helper and cycle analytics usage data spec41777-include-cycle-time-in-usage-ping | Tiago Botelho | 2018-03-01 | 22 | -123/+242 |
| | | | | | | | | |