summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'docs/how-to-add-global-hooks-and-some-updates' into 'master'Evan Read2019-04-301-21/+44
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add guide to custom global hooks See merge request gitlab-org/gitlab-ce!27847
| * | | | | | | | | Add guide to custom global hooksCindy Pallares2019-04-301-21/+44
| | | | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'origin/master'John T Skarbek2019-04-305-7/+28
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js-i18n-integrations' into 'master'Fatih Acet2019-04-302-4/+11
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of integrations directory See merge request gitlab-org/gitlab-ce!27682
| | * | | | | | | | | | Internationalisation of integrations directoryBrandon Labuschagne2019-04-302-4/+11
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
| * | | | | | | | | | Merge branch 'js-i18n-protected-tags' into 'master'Fatih Acet2019-04-304-3/+17
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of protected_tags directory See merge request gitlab-org/gitlab-ce!27739
| | * | | | | | | | | | Internationalisation of protected_tags directoryBrandon Labuschagne2019-04-304-3/+17
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | | | Merge remote-tracking branch 'origin/master'John T Skarbek2019-04-30213-861/+2972
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'group-project-template-in-paid-features' into 'master'Michael Kozono2019-04-301-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group project templates should be a Silver/Premium feature - CE backport See merge request gitlab-org/gitlab-ce!27407
| | * | | | | | | | | | Update projects controllergroup-project-template-in-paid-featuresMałgorzata Ksionek2019-04-161-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'style/fix-typo' into 'master'Douglas Barbosa Alexandre2019-04-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style: fix typo See merge request gitlab-org/gitlab-ce!27918
| | * | | | | | | | | | | style: fix typoRoger Meier2019-04-301-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'js-i18n-u2f' into 'master'Tim Zallmann2019-04-302-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of u2f directory See merge request gitlab-org/gitlab-ce!27749
| | * | | | | | | | | | | Internationalisation of u2f directoryBrandon Labuschagne2019-04-302-4/+20
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
| * | | | | | | | | | | Merge branch 'feat/sentry-environment' into 'master'Douglas Barbosa Alexandre2019-04-3012-14/+103
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feat: add option to define the Sentry Environment See merge request gitlab-org/gitlab-ce!27091
| | * | | | | | | | | | | feat: allow Sentry configuration to be passed on gitlab.ymlRoger Meier2019-04-3012-14/+103
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch '60965-referencing-issues-or-epics-by-url-fails-with-404' into ↵Douglas Barbosa Alexandre2019-04-301-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Referencing issues or epics by URL fails with 404" Closes #61099 and #60965 See merge request gitlab-org/gitlab-ce!27827
| | * | | | | | | | | | | Don't allow a relative_url_root of '/'Sean McGivern2019-04-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fail in a few ways: 1. We might end up having a path (not a URL) starting with `//`, which will be interpreted by browsers as a protocol-relative URL. 2. Issue, MR, snippet, etc. reference parsing will look for URLs at `http://gitlab.example.com//project/...`, with the double slash preventing single slashes from working. In general, it doesn't seem like there's a valid case for this.
| * | | | | | | | | | | | Merge branch 'jc-client-for-fetch-objects-into-pool' into 'master'Stan Hu2019-04-308-80/+156
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add client methods for FetchIntoObjectPool RPC See merge request gitlab-org/gitlab-ce!27767
| | * | | | | | | | | | | | Add client methods for FetchIntoObjectPool RPCJohn Cai2019-04-308-80/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly's FetchIntoObjectPool RPC will idempotently fetch objects into an object pool. If the pool doesn't exist, it will create an empty pool before attempting the fetch. This change adds client code as well as specs to cover this behavior.
| * | | | | | | | | | | | | Merge branch 'docs/gitlab-basics-mvc' into 'master'Mike Lewis2019-04-302-23/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MVC improvements to basics landing page See merge request gitlab-org/gitlab-ce!27865
| | * | | | | | | | | | | | | MVC improvements to basics landing pageEvan Read2019-04-302-23/+39
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'docs/projects' into 'master'Marcia Ramos2019-04-301-2/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added content on the Admin Area's `Projects` page See merge request gitlab-org/gitlab-ce!27447
| | * | | | | | | | | | | | | Added content on the Admin Area's `Projects` pageRussell Dickenson2019-04-301-2/+26
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of issue 57874
| * | | | | | | | | | | | | Merge branch 'clarify-custom-issue-tracker-docs' into 'master'Marcia Ramos2019-04-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that `project_url` is used See merge request gitlab-org/gitlab-ce!27163
| | * | | | | | | | | | | | | Clarify that `project_url` is usedSean McGivern2019-04-301-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '10445-issue' into 'master'Kushal Pandya2019-04-301-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move EE differences for `app/views/projects/issues/_issue.html.haml` See merge request gitlab-org/gitlab-ce!27804
| | * | | | | | | | | | | | | | Move EE differences for projects issueRajat Jain2019-04-291-0/+2
| | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'js-i18n-projects' into 'master'Kushal Pandya2019-04-302-17/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of projects directory See merge request gitlab-org/gitlab-ce!27733
| | * | | | | | | | | | | | | | Internationalisation of projects directoryBrandon Labuschagne2019-04-302-17/+69
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
| * | | | | | | | | | | | | | Merge branch 'sh-upgrade-mermaid-8.0' into 'master'Kushal Pandya2019-04-302-31/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Mermaid to 8.0.0 See merge request gitlab-org/gitlab-ce!27706
| | * | | | | | | | | | | | | | Upgrade Mermaid to 8.0.0Stan Hu2019-04-262-31/+102
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using 8.0.0-rc.8 previously, and there appears to be significant new dependencies.
| * | | | | | | | | | | | | | Merge branch 'refactor/58830-migrate-sidebar-spec-to-jest' into 'master'Kushal Pandya2019-04-3015-51/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor(sidebar): Refactored shared sidebar component tests to Jest Closes #58830 See merge request gitlab-org/gitlab-ce!27688
| | * | | | | | | | | | | | | | refactor(sidebar): Refactored Karma spec files to JestMartin Hobert2019-04-2615-51/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #58830 Added changelog Updated to use jest functions Added mock implementation
| * | | | | | | | | | | | | | | Merge branch 'js-i18n-ide' into 'master'Kushal Pandya2019-04-303-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of ide directory See merge request gitlab-org/gitlab-ce!27680
| | * | | | | | | | | | | | | | | Internationalisation of ide directoryBrandon Labuschagne2019-04-253-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
| * | | | | | | | | | | | | | | | Merge branch 'js-i18n-blob' into 'master'Kushal Pandya2019-04-306-11/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of blob directory See merge request gitlab-org/gitlab-ce!27670
| | * | | | | | | | | | | | | | | Internationalisation of blob directoryBrandon Labuschagne2019-04-306-11/+49
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
| * | | | | | | | | | | | | | | Merge branch 'fix-environment-on-stop-not-work' into 'master'Sean McGivern2019-04-3010-5/+169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `on_stop` is not automatically triggered with pipelines for merge requests Closes #60885 See merge request gitlab-org/gitlab-ce!27618
| | * | | | | | | | | | | | | | Fix environment automatic on_stop triggerShinya Maeda2019-04-3010-5/+169
| | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the nature of pipelines for merge requests, deployments.ref can be a merge request ref instead of a branch name. We support the environment auto-stop hook for this case
| * | | | | | | | | | | | | | Merge branch 'bw-add-graphql-groups' into 'master'Grzegorz Bizon2019-04-3013-5/+222
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic GraphQL for a Group Closes #60786 See merge request gitlab-org/gitlab-ce!27492
| | * | | | | | | | | | | | | Mention group query in GraphQL documentationbw-add-graphql-groupsBrett Walker2019-04-231-1/+5
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Refactor group query specBrett Walker2019-04-232-107/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and removing unnecessary code
| | * | | | | | | | | | | | | Basic GraphQL for a groupBrett Walker2019-04-2312-4/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new query for Groups, with new GroupType and NamespaceType
| * | | | | | | | | | | | | | Merge branch 'fix-danger-when-nobody-in-category' into 'master'James Lopez2019-04-301-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reviewer roulette when no-one is in a category See merge request gitlab-org/gitlab-ce!27895
| | * | | | | | | | | | | | | | Fix reviewer roulette when no-one is in a categorySean McGivern2019-04-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would return `people.size` before, when it should return `nil`.
| * | | | | | | | | | | | | | | Merge branch 'pl-fix-k8s-ns-query-variables' into 'master'Grzegorz Bizon2019-04-304-5/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use correct k8s namespace in Prometheus queries See merge request gitlab-org/gitlab-ce!27812
| | * | | | | | | | | | | | | | | Also define KubernetesService#namespace_forPeter Leitzen2019-04-291-0/+4
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Remove superfluous navigator operatorPeter Leitzen2019-04-291-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Use correct k8s namespace in Prometheus queriesPeter Leitzen2019-04-293-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit the wrong namespace could have been used in Prometheus queries for group-level installations.