Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve conflicts from masterjl-remove-k8s-components-mermaid-docs | Joshua Lambert | 2019-05-08 | 1 | -99/+65 |
| | |||||
* | Docs nneul/gitlab ce patch 1 | Ian Baum | 2019-05-08 | 1 | -0/+16 |
| | |||||
* | Merge branch 'revert-0658ebf7' into 'master' | Achilleas Pipinellis | 2019-05-08 | 1 | -5/+2 |
|\ | | | | | | | | | Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'" See merge request gitlab-org/gitlab-ce!28193 | ||||
| * | Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'"revert-0658ebf7 | Stan Hu | 2019-05-07 | 1 | -5/+2 |
| | | | | | | This reverts merge request !28188 | ||||
* | | Add info to docs about mapping a ping to the category it belongs to. | Emilie Schario | 2019-05-07 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'fix-mermaid-chart-docs' into 'master' | Sid Sijbrandij | 2019-05-07 | 1 | -2/+5 |
|\ | | | | | | | | | Load mermaid.min.js for now off-site See merge request gitlab-org/gitlab-ce!28188 | ||||
| * | Load mermaid.min.js for now off-site | Joshua Lambert | 2019-05-07 | 1 | -2/+5 |
| | | |||||
* | | Document EE License Auto Import During Install | Robert Marshall | 2019-05-07 | 3 | -3/+35 |
|/ | | | | | | | | | - Document how to properly configure `GITLAB_LICENSE_FILE` environment variable in source and omnibus installations. Resolves: https://gitlab.com/gitlab-org/gitlab-ee/issues/10808 Signed-off-by: Robert Marshall <rmarshall@gitlab.com> | ||||
* | docs: clarify LDAP cache time | Ben Bodenmiller | 2019-05-07 | 1 | -2/+2 |
| | |||||
* | Merge branch 'docs-10k-ref-wip' into 'master' | Drew Blessing | 2019-05-07 | 1 | -1/+25 |
|\ | | | | | | | | | Add the 10k ref architecture specs to HA docs See merge request gitlab-org/gitlab-ce!28149 | ||||
| * | Apply suggestion to doc/administration/high_availability/README.md | Drew Blessing | 2019-05-07 | 1 | -1/+1 |
| | | |||||
| * | Add the WIP 10k ref architecture specs to HA docs | Drew Blessing | 2019-05-06 | 1 | -1/+25 |
| | | | | | | | | | | | | | | The 10,000 user reference architecture work is ongoing. However, we have done some preliminary investigation and testing and have an idea of what we think the environment might look like. In the interest of transparency, efficiency and iteration, let's get this out there. | ||||
* | | Merge branch '56850-add-new-unicorn-metrics' into 'master' | Ash McKenzie | 2019-05-07 | 1 | -4/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "Add new Unicorn metrics" Closes #56850 See merge request gitlab-org/gitlab-ce!27474 | ||||
| * | | Clarify wording in metrics documentation56850-add-new-unicorn-metrics | Ryan Cobb | 2019-05-01 | 1 | -2/+2 |
| | | | |||||
| * | | Add back ruby_memory_bytes metric, limit duplication, clean up | Ryan Cobb | 2019-04-29 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | This adds back ruby_memory_bytes for backwards compatibility, limits code duplication, cleans up unused methods, and limits the unicorn worker sampling scope. | ||||
| * | | Update docs and calculate process start time via proc table | Ryan Cobb | 2019-04-24 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | This updates monitor docs to reflect the new ruby and unicorn metrics as well as making it so we fetch process start time via the proc table instead of via CLOCK_BOOTTIME | ||||
* | | | Update component diagram, switch to mermaid | Joshua Lambert | 2019-05-07 | 1 | -2/+146 |
| | | | |||||
* | | | Merge branch '54405-resolve-discussion-when-applying-a-suggested-change' ↵ | Phil Hughes | 2019-05-07 | 1 | -6/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Resolve discussion when suggestion is applied" Closes #54405 See merge request gitlab-org/gitlab-ce!28160 | ||||
| * | | | Resolve discussion when suggestion is applied54405-resolve-discussion-when-applying-a-suggested-change | Paul Slaughter | 2019-05-07 | 1 | -6/+3 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | - Adds color and a tooltip to describe this new behavior - Does not resolve if discussion is already resolved - Adds an action `resolveDiscussion` to simplify `toggleResolveNote` - Updates docs https://gitlab.com/gitlab-org/gitlab-ce/issues/54405 | ||||
* | | | Merge branch 'patch-35' into 'master' | Achilleas Pipinellis | 2019-05-07 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | fix alert box formatting See merge request gitlab-org/gitlab-ce!28159 | ||||
| * | | | fix alert box formatting | Ben Bodenmiller | 2019-05-07 | 1 | -2/+2 |
| |/ / | |||||
* | | | Remove from providers with icon | Gosia Ksionek | 2019-05-07 | 5 | -0/+80 |
| | | | | | | | | | | | | | | | | | | Remove puts Remove puts | ||||
* | | | Merge branch 'patch-17' into 'master' | Bob Van Landuyt | 2019-05-07 | 1 | -5/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | remove note that multi-line suggestions are not yet available See merge request gitlab-org/gitlab-ce!28119 | ||||
| * | | | remove note that multi-line suggestions are not yet available | Simon Hardt | 2019-05-06 | 1 | -5/+0 |
| | | | | | | | | | | | | (#53310 is now done) | ||||
* | | | | Merge branch 'patch-17' into 'master' | Bob Van Landuyt | 2019-05-07 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | doc/ci: include local: remove superfluous ":" See merge request gitlab-org/gitlab-ce!28112 | ||||
| * | | | | include local: remove superfluous ":" | Elan Ruusamäe | 2019-05-06 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Fix installation from source | Dmitriy Zaporozhets | 2019-05-07 | 1 | -1/+1 |
| | | | | | | | | | | | | Compiling git has a wrong symbol that leads into invalid command | ||||
* | | | | Merge branch 'allow-replying-to-individual-notes-from-api' into 'master' | James Lopez | 2019-05-07 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow replying to an individual note in the API Closes #61392 See merge request gitlab-org/gitlab-ce!28120 | ||||
| * | | | | Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-api | Sean McGivern | 2019-05-06 | 1 | -2/+4 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | If you can do this in the UI, you should be able to do it in the API. If a discussion is not a single note discussion, or it is replyable, you can reply to it. | ||||
* | | | | Merge branch 'docs-destroy-the-mirrors' into 'master' | Evan Read | 2019-05-07 | 2 | -2/+4 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Correct repo mirror SSH key generation docs See merge request gitlab-org/gitlab-ce!27998 | ||||
| * | | | Correct repo mirror SSH key generation docsdocs-destroy-the-mirrors | Luke Bennett | 2019-05-03 | 2 | -2/+4 |
| | | | | |||||
* | | | | Show health graphs on group-level | Peter Leitzen | 2019-05-06 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | Tweak cluster helper and refactor its specs. | ||||
* | | | | Implement support for CI variables of type file | Krasimir Angelov | 2019-05-06 | 4 | -25/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add env_var and file as supported types for CI variables. Variables of type file expose to users existing gitlab-runner behaviour - save variable value into a temp file and set the path to this file in an ENV var named after the variable key. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/46806. | ||||
* | | | | Merge branch '61222-reporters-can-create-labels-in-projects-groups' into ↵ | Achilleas Pipinellis | 2019-05-06 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Reporters can create labels in projects/groups" Closes #61222 See merge request gitlab-org/gitlab-ce!27991 | ||||
| * | | | | Correct label permissions documentation61222-reporters-can-create-labels-in-projects-groups | Sean McGivern | 2019-05-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | Reporters can manage labels; you don't need to be a Developer. | ||||
* | | | | | Remove cleaned up OIDs from database and cache | Nick Thomas | 2019-05-06 | 1 | -0/+6 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'feature/omniauth_oidc_strategy' into 'master' | Ash McKenzie | 2019-05-06 | 2 | -0/+106 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added Omniauth OpenID Connect strategy See merge request gitlab-org/gitlab-ce!27383 | ||||
| * | | | | Added Omniauth OpenId Connect startegy | Horatiu Eugen Vlad | 2019-05-06 | 2 | -0/+106 |
| | | | | | |||||
* | | | | | Merge branch 'docs-60665-uninstalling-cluster-apps' into 'master' | Ash McKenzie | 2019-05-06 | 1 | -0/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document Prometheus app can be uninstalled Closes #60665 See merge request gitlab-org/gitlab-ce!28098 | ||||
| * | | | | | Document Prometheus app can be uninstalleddocs-60665-uninstalling-cluster-apps | Thong Kuah | 2019-05-06 | 1 | -0/+21 |
| | | | | | | |||||
* | | | | | | Docs: Realigning scattered EE docs into CE | Marcel Amirault | 2019-05-06 | 11 | -75/+330 |
| | | | | | | |||||
* | | | | | | Add troubleshooting step for older docker clients | Ian Baum | 2019-05-06 | 1 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The container registry needs a compatibility setting enabled for older docker clients. This will document how to enable the setting for omnibus and source installations. | ||||
* | | | | | | Edit regionendpoint text | Evan Read | 2019-05-06 | 1 | -9/+5 |
| | | | | | | |||||
* | | | | | | Docs: Change geo redirects to relative to match EE | Marcel Amirault | 2019-05-06 | 19 | -38/+38 |
| | | | | | | |||||
* | | | | | | Docs: Second Attempt to realign administration/geo docs | Marcel Amirault | 2019-05-05 | 1 | -4/+71 |
| | | | | | | |||||
* | | | | | | Docs: Merge EE doc/administration/high_availability to CE | Marcel Amirault | 2019-05-05 | 10 | -118/+1854 |
|/ / / / / | |||||
* | | | | | Docs: Merge EE doc/gitlab-geo to CE | Marcel Amirault | 2019-05-05 | 19 | -0/+95 |
| | | | | | |||||
* | | | | | Docs: Merge EE doc/user/application_security to CE | Marcel Amirault | 2019-05-05 | 23 | -0/+1411 |
| | | | | | |||||
* | | | | | Docs: Merge EE doc/administration/geo to CE | Marcel Amirault | 2019-05-05 | 28 | -0/+4329 |
| | | | | | |||||
* | | | | | Docs: Merge Various EE /doc dirs to CE | Marcel Amirault | 2019-05-05 | 18 | -20/+304 |
| | | | | |