summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-153-0/+23
|\ | | | | | | | | | | | | Submit to Akismet Part 1 (Issues) Related to #5932 #5573 gitlab-com/infrastructure#14 See merge request !5538
| * Added Documentation and CHANGELOGPatricio Cano2016-08-153-0/+23
| |
* | Add documentation for test coverage report badgeGrzegorz Bizon2016-08-152-10/+37
|/
* Ability to specify branches for pivotal tracker integrationEgor Lynko2016-08-151-2/+2
|
* Merge branch 'update-performance-guide' into 'master' Achilleas Pipinellis2016-08-121-5/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected links/usernames in performance guide ## What does this MR do? This fixes two broken links in the performance guide and removes the mention of Josh as he no longer works for GitLab. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? The guide contained two broken links, and Josh no longer works for GitLab. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5772
| * Corrected links/usernames in performance guideupdate-performance-guideYorick Peterse2016-08-111-5/+4
| | | | | | | | | | | | | | This fixes two broken links in the performance guide and removes the mention of Josh as he no longer works for GitLab. [ci skip]
* | Update gitlab-shell to v3.3.3Douwe Maan2016-08-111-1/+1
| |
* | Merge branch 'ruby-2-3-lets-not-break-things' into 'master' Douwe Maan2016-08-111-7/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Ruby 2.3.1 ## What does this MR do? This WIP MR will eventually introduce 2.3 as default language for GitLab CE/EE ## Why was this MR needed? @connorshea wants to be prepared for Rails 5.0, so we need Ruby > 2.2, so why not go 2.3 already? ## What are the relevant issue numbers? Closes #12507 ## TODO - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing - [ ] [Omnibus uses 2.3.1](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/847) See merge request !4948
| * | Update currently supported Ruby version info.Connor Shea2016-08-111-1/+1
| | |
| * | Update docs to reference Ruby 2.3.1Connor Shea2016-08-111-7/+6
| | |
* | | Merge branch 'remove-schedules' into 'master' Sid Sijbrandij2016-08-111-5/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Remove need for schedules Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/15156 \cc @pmachle , \cc @dusek See merge request !3685
| * | editremove-schedulesErnst van Nierop2016-04-131-1/+1
| | |
| * | remove need for schedulesernstvn2016-04-121-5/+9
| | |
* | | Merge branch '18583-implement-access-request-to-project-group-api' into ↵Rémy Coutable2016-08-115-170/+337
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add group members API endpoints to request access and approve requests ## What does this MR do? Add group members API endpoints to request access and approve requests. ## Are there points in the code the reviewer needs to double check? I chose to factorize the group/project members API as well as the new group/project access requests API. I initially also created new services to centralize the permission checks related to actions on members, but this was out of scope and this MR is already quite big so I opened a temp MR at !5566 based on this one. ## Why was this MR needed? To finish the "request access" feature. ## What are the relevant issue numbers? Closes #18583. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4833
| * | Fix doc linting errors and remove useless API specs18583-implement-access-request-to-project-group-apiRémy Coutable2016-08-112-18/+18
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | New AccessRequests API endpoints for Group & ProjectRémy Coutable2016-08-105-170/+337
| | | | | | | | | | | | | | | | | | | | | | | | Also, mutualize AccessRequests and Members endpoints for Group & Project. New API documentation for the AccessRequests endpoints. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'improve-oauth2-docs' into 'master' Achilleas Pipinellis2016-08-111-12/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update/Improve OAuth2 Client documentation ## What does this MR do? Improves the OAuth2 client documentation to include security hints to help people create secure clients. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? I noticed the docs didn't mention some important points and steps, this cleans that up. ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5665
| * | | Update/Improve OAuth2 Client documentationKeith Pope2016-08-111-12/+38
| | | |
* | | | Merge branch 'convert-shortcuts-md' into 'master' Achilleas Pipinellis2016-08-112-1/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert shortcuts image into markdown ## What does this MR do? Recreates shortcuts page into markdown ## Are there points in the code the reviewer needs to double check? Double check all the shortcuts are correct ## Why was this MR needed? Improve maintainability of this page ## What are the relevant issue numbers? Closes #20160 See merge request !5452
| * | | | Convert shortcuts image into markdownClement Ho2016-08-032-1/+72
| | | | |
* | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-08-111-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update container_registry.md ## What does this MR do? Add a warning about what ports to choose for the external registry URL ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? It would have saved me about 3 hours if this line was in the document. ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? It's just a one-line documentation addition. - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5238
| * | | | Update container_registry.mdDavid Warburton2016-08-011-1/+3
| | | | |
| * | | | Update container_registry.mdDavid Warburton2016-07-131-0/+2
| | | | |
* | | | | Merge branch 'decouple-secret-keys' into 'master' Douwe Maan2016-08-102-17/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store OTP secret key in secrets.yml ## What does this MR do? Migrate the value of `.secret` to `config/secrets.yml` if present, so that `.secret` can be rotated without preventing all users with 2FA from logging in. (On a clean setup, generate different keys for each.) ## Are there points in the code the reviewer needs to double check? I'm not sure we actually need `.secret` at all after this, but it seems safer not to touch it. ## Why was this MR needed? We have some DB encryption keys in `config/secrets.yml`, and one in `.secret`. They should all be in the same place. ## What are the relevant issue numbers? #3963, which isn't closed until I make the relevant changes in Omnibus too. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5274
| * | | | | Mention that gitlab.rb must be kept, toodecouple-secret-keysSean McGivern2016-08-041-11/+12
| | | | | |
| * | | | | Mention that gitlab.rb needs to be keptSean McGivern2016-08-031-7/+7
| | | | | |
| * | | | | Store OTP secret key in secrets.ymlSean McGivern2016-08-032-15/+16
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .secret stores the secret token used for both encrypting login cookies and for encrypting stored OTP secrets. We can't rotate this, because that would invalidate all existing OTP secrets. If the secret token is present in the .secret file or an environment variable, save it as otp_key_base in secrets.yml. Now .secret can be rotated without invalidating OTP secrets. If the secret token isn't present (initial setup), then just generate a separate otp_key_base and save in secrets.yml. Update the docs to reflect that secrets.yml needs to be retained past upgrades, but .secret doesn't.
* | | | | Merge branch 'add-column-with-default-to-downtime-guide' into 'master' Achilleas Pipinellis2016-08-101-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention add_column_with_default in downtime guide ## What does this MR do? This extends the "What causes downtime" guide with a mention of the `add_column_with_default` migration helper. ## Are there points in the code the reviewer needs to double check? Spelling, grammar, etc. ## Why was this MR needed? Currently the guide may lead one to believe it's not possible at all to add a column with a default value. ## Does this MR meet the acceptance criteria? - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5719
| * | | | | Mention add_column_with_default in downtime guideadd-column-with-default-to-downtime-guideYorick Peterse2016-08-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix-angle-brackets-in-docs' into 'master' Achilleas Pipinellis2016-08-104-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix escaped angle bracket's in integration documentation. There are several escaped angle brackets in our integration docs. While these render fine within GitLab, they are broken when rendered on doc.gitlab.com because pandoc does not escape them correctly. You can see the problem here: http://doc.gitlab.com/ce/integration/github.html Note that the strings `<Organization>` and `<Your Name>` are being interpreted as html tags. It looks like doc.gitlab.com is using pandoc: https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/generate.rb#L64 You can verify these changes by running something like this and then inspecting `test.html`: pandoc --from markdown_github-hard_line_breaks -o test.html doc/integration/twitter.md You can also verify that GitLab continues to render the docs correctly by checking, for example, http://localhost:3000/help/integration/twitter.md See merge request !4128
| * | | | | | Fix escaped angle bracket's in integration documentation.Eric K Idema2016-05-124-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several escaped angle brackets in our integration docs. While these render fine within GitLab, they are broken rendered on doc.gitlab.com because pandoc does not escape them correctly.
* | | | | | | Merge branch 'update-ui-guide--svgs' into 'master' Dmitriy Zaporozhets2016-08-101-0/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update UI Guide with SVG guidelines This addition to the guide is to provide some guidelines to UX designers when exporting SVGs. Please let me know if anything is unclear or if you any improvements so we can document it clearly for everyone. cc / @hazelyang @cperessini @dimitrieh @connorshea @annabeldunstone @dzaporozhets ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/872 See merge request !5748
| * | | | | | | spellcheckupdate-ui-guide--svgsTaurie Davis2016-08-091-2/+2
| | | | | | | |
| * | | | | | | Add svg guidelines to ui guideTaurie Davis2016-08-091-0/+36
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Small refactor of doc/development/README.mdAchilleas Pipinellis2016-08-101-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix wrong doc_styleguide URL - Clarify migrations refer to SQL - Capitalize CSS
* | | | | | | Merge branch 'link-to-gdk-howtos' into 'master' Achilleas Pipinellis2016-08-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to doc root, not readme of GDK I hope this makes navigation between gitlab-ce developer docs and GDK docs more smooth. See merge request !5716
| * | | | | | | Link to doc root, not readme of GDKJacob Vosmaer2016-08-081-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'api-examples-curl-long-options' into 'master' Achilleas Pipinellis2016-08-1043-673/+673
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use long options for curl examples in documentation ## What does this MR do? Use long options (e.g. `--header` instead of `-H`) for curl examples in documentation. ## Why was this MR needed? Short options are less readable. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5465#note_13603730 See merge request !5703
| * | | | | | | use Unix line endings for API documentationwinniehell2016-08-091-514/+514
| | | | | | | |
| * | | | | | | use long options for curl examples in API documentation (!5703)winniehell2016-08-0943-161/+161
| | | | | | | |
* | | | | | | | Merge branch 'default-label-documentation' into 'master' Achilleas Pipinellis2016-08-103-10/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify the features for generating default label sets ## What does this MR do? * Split out the information regarding the label set that GitLab can generate * Add information for the labels view in the Admin panel ## Are there points in the code the reviewer needs to double check? * Please ensure that the newly added section relating to the Admin area seems relevant * Please verify adherence to the documentation styleguide ## Why was this MR needed? Documentation regarding default label sets was missing ## What are the relevant issue numbers? Closes #1865 See merge request !5736
| * | | | | | | | Clarify the features for generating default label setsMark Fletcher2016-08-093-10/+31
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split out the information regarding the label set that GitLab can generate * Add information for the labels view in the Admin panel
* | | | | | | | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-091-3/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check out GH pull requests locally where the source/target branch had been deleted ## What does this MR do? Check out GitHub pull requests where source/target branches that had been deleted locally rather than temporarily restoring them on GitHub using their References API. This helps us to not get rate limited, and allow us to import cross-repository pull requests (those from forks). ## What are the relevant issue numbers? Fixes #15528 Fixes #17766 Fixes #19310 Fixes #19439 Fixes #19998 Fixes #20153 Fixes #20552 Fixes https://gitlab.com/gitlab-com/support-forum/issues/801 #20385 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5630
| * | | | | | | | Allow users to import cross-repository pull requests from GitHubDouglas Barbosa Alexandre2016-08-041-3/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-092-26/+283
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # lib/gitlab/redis.rb
| * | | | | | | | Small refactor and a few documentation fixesGabriel Mazetto2016-08-041-2/+2
| | | | | | | | |
| * | | | | | | | Updated documentations for Redis Sentinel experimental supportGabriel Mazetto2016-08-041-23/+28
| | | | | | | | |
| * | | | | | | | Refactor Redis HA docs to also include SentinelAchilleas Pipinellis2016-08-041-102/+245
| | | | | | | | |
| * | | | | | | | Added Redis Sentinel support documentationGabriel Mazetto2016-08-041-0/+107
| | | | | | | | |
| * | | | | | | | Reverted resque.yml -> redis.yml renamingGabriel Mazetto2016-08-041-1/+1
| | | | | | | | |