summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'patch-7' into 'master' Rémy Coutable2016-10-251-1/+1
| | | | | This will change the update process to checkout gitlab-shell version 3.6.6 instead of 3.6.3 as currently described in the update document See merge request !6976
* Merge branch 'docs/dynamic-envs-yaml' into 'master'Achilleas Pipinellis2016-10-251-25/+135
| | | | | | | | | | | | Refactor and add new environment functionality to CI yaml reference Add new `environment` functionality to the yaml reference. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23484 See merge request !7026 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-212-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | Use separate queues for all Sidekiq workers ## What does this MR do? This MR updates all workers so that they (mostly) use their own Sidekiq queues. This in turn allows us to monitor queues more accurately and in the future impose queue specific throttles, limits, etc. This is a critical part we need in 8.13, despite it being so close to release day. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 for more information. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 See merge request !7006
* Merge branch 'patch-1' into 'master' Rémy Coutable2016-10-211-1/+1
| | | | | | | | | [Doc] Fix `ref` parameter name for `commits/statuses` The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`). Tested on Gitlab CE 8.9. See merge request !4876
* Merge branch '23555-project-api-doc' into 'master' Rémy Coutable2016-10-201-4/+2
| | | | | | | | | | | | | | | | | | | Resolve "Breaking a parameter table in Projects API doc" ## What does this MR do? - A broken markdown in `Search for projects by name` is fixed. - cf. !6681 - Pagination is removed from `Search for projects by name` like other docs as it is shown in [/api/README.html](https://docs.gitlab.com/ce/api/README.html) ## Moving docs to a new location? No. ## What are the relevant issue numbers? Closes #23555 See merge request !7007
* Merge branch 'fix-system-hook-api' into 'master' Rémy Coutable2016-10-201-5/+2
| | | | | | | | | | | | | API: Fix Sytem hooks delete behavior ## What does this MR do? This corrects the delete API for system hooks. Returning 200 is not the right way indicating a hooks is not found. ## What are the relevant issue numbers? Discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6861/diffs#609af00c90e3d5241064d1404e3e018a3235634a_64_62 See merge request !6883
* Merge branch 'feature/group-level-labels' into 'master'Douwe Maan2016-10-201-1/+2
| | | | | | | | | | | | | | | | Add group level labels. * `LabelsFinder` * `Gitlab::Gfm::ReferenceRewriter` * `Banzai::Filter::LabelReferenceFilter` We'll be adding more feature that allow you to do cross-project management of issues. loses #19997 See merge request !6425 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'dz-rename-user-routes' into 'master'Robert Speicher2016-10-1713-87/+87
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Rename users routing from /u/:username to /users/:username for consistency with other routes Renames /u/:username to /users/:username To follow consistency with other routes (like groups) and UsersController name. Now when you can use `/:username` for accessing user page there is no need in shortcut like `/u/` See merge request !6851
| * Remove /u/ prefix from user pages in documentationDmitriy Zaporozhets2016-10-1313-87/+87
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Updated logo from @lukeMatt Lee2016-10-171-0/+0
| |
* | Convert CHANGELOG to MarkdownRobert Speicher2016-10-161-1/+1
| | | | | | | | | | | | | | | | | | All this does is convert the version sections into headers. The list items shouldn't really be indented by two spaces, but it makes no difference to the rendering and this way we retain authorship history for the actual changes. Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
* | Merge branch 'master' into 'docs/change-docs-reviewers'Achilleas Pipinellis2016-10-1613-8/+160
|\ \ | | | | | | | | | # Conflicts: # doc/development/doc_styleguide.md
| * \ Merge branch '23353-add-bookclub-to-university' into 'master' Achilleas Pipinellis2016-10-163-0/+133
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added book club to university ## What does this MR do? Adds the old University Book Club to the new University content ## What are the relevant issue numbers? Closes #23353 See merge request !6888
| | * | Added book club to university23353-add-bookclub-to-universitySean Packham2016-10-143-0/+133
| | | |
| * | | Merge branch 'clarify-cache-and-artifact-paths' into 'master' Achilleas Pipinellis2016-10-161-3/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes a note on valid paths for cache and artifacts in the place users are most likely to learn about the feature. ## Why was this MR needed? We get regular support requests relating to cache and artifacts not being picked up outside the project root. It's intended behaviour, and should be documented. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1792 See merge request !6892
| | * | | Document restrictions on cache and artifact pathsNick Thomas2016-10-141-3/+4
| | |/ / | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1792
| * | | remove ashley since she no longer works hereDe Wet Blomerus2016-10-151-1/+1
| | | |
| * | | Add docs for request profilingfix/request-profiler-docsAhmad Sherif2016-10-145-1/+19
| | | | | | | | | | | | | | | | Closes #23239
| * | | Use gitlab-workhorse 0.8.5Nick Thomas2016-10-142-2/+2
| |/ /
| * | Merge branch 'patch-6' into 'master' Achilleas Pipinellis2016-10-141-1/+1
| |\ \ | | | | | | | | | | | | | | | | Fix grafana_configuration.md move link See merge request !6871
| | * | fix grafana_configuration.md move linkBen Bodenmiller2016-10-131-1/+1
| | | |
* | | | Add the tech writers usernames in the doc_sytleguide docdocs/change-docs-reviewersAchilleas Pipinellis2016-10-161-4/+4
|/ / / | | | | | | | | | [ci skip]
* | | Merge branch '23332-fix-missing-glossary-link' into 'master' Achilleas Pipinellis2016-10-141-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix missing Glossary link" ## What does this MR do? Fixes broken links in University. ## What are the relevant issue numbers? Closes #23332 See merge request !6880
| * | | Fixed missing linksSean Packham2016-10-141-1/+1
| | | |
| * | | Fixed missing linksSean Packham2016-10-141-4/+4
| | | |
* | | | Merge branch 'docs/clarify-new-ci-permissions-some-more' into 'master' Achilleas Pipinellis2016-10-141-18/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more info on the new CI permissions model From discussion in issue https://gitlab.com/gitlab-org/gitlab-ce/issues/22484 See merge request !6843
| * | | | Add link to update docs for source installationsAchilleas Pipinellis2016-10-141-1/+2
| | | | |
| * | | | Add more info on the new CI permissions modeldocs/clarify-new-ci-permissions-some-moreAchilleas Pipinellis2016-10-131-18/+36
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'docs/refactor-merge-request-revisions' into 'master' Achilleas Pipinellis2016-10-144-10/+20
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Refactor merge requests revisions docs See merge request !6878
| * | | | Refactor merge requests revisionsAchilleas Pipinellis2016-10-144-10/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | - A system note now appears on every push - Replace dashes with underscores in images [ci skip]
* | | | Link to review apps example from docsAchilleas Pipinellis2016-10-142-0/+3
|/ / / | | | | | | | | | [ci skip]
* | | Merge branch 'feature/cycle-analytics-2-backend' into 'master' Douwe Maan2016-10-131-12/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement second iteration of cycle analytics - Change in data measurement Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/22458 Measure everything that happened in the given time range, not only what's been pushed to production. With the exception of the staging and production stages. - [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 - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6798
| * | | Ignore deployment for statistics in Cycle Analytics, except in staging and ↵James Lopez2016-10-121-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | production stages Also, updated specs and docs.
* | | | Merge branch 'ha-doc-secret-names' into 'master' Achilleas Pipinellis2016-10-131-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix secret names in HA docs See https://gitlab.com/gitlab-org/gitlab-ee/issues/1110#note_16854559. I don't think this needs a CHANGELOG item really. See merge request !6845
| * | | | Fix secret names in HA docsha-doc-secret-namesSean McGivern2016-10-131-3/+3
| | |/ / | |/| |
* | | | Merge branch 'feature/improve-mrwbs-and-todos-for-pipelines' into 'master' Kamil Trzciński2016-10-131-10/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger Merge When Pipeline Succeeds on pipeline event ## What does this MR do? This MR is meant to improve merge when build succeeds triggers, which has an impact on performance. - [x] Move Merge When Build Succeeds trigger from commit status to pipeline event - [x] Drop support for triggering event for branches that include commit status submitted without branch (no longer relevant) - [x] Perform Merge When Pipeline Succeeds asynchronously to improve performance and avoid race conditions - [x] Add missing feature test that verifies if MWBS feature actually works and merges merge requests - [x] Update the documentation to reflect change in the behavior Moved to separate merge request: - [ ] Rename Merge When Build Succeeds to Merge When Pipeline Succeeds - [ ] Update documentation to reflect name change for this feature ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !6675
| * | | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-129-6/+900
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update health_check gem to `~> 2.2.0` API: Version information Revert "Merge branch 'tests-use-tmpfs' into 'master'" Added documentation chapter for Git attributes Use activerecord_sane_schema_dumper Add a separate stage for bundle check Add a bundle check step to ensure dependencies are correct Create a new /templates API namespace Add disabled delete button to protected branches Make spec deterministic refactors tests because of gitlab-test repository changes Addresses Robert's feedback Speed up specs for GET /projects/:id/events API: New /users/:id/events endpoint writes tests to verify the issue is solved and fixes breaking issues. removes inconsistency regarding tagging immediately as merged once you create a branch using new branch button and adds changelog entry
| * \ \ \ Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-12159-2321/+3358
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (221 commits) Add CHANGELOG entry for 8.12.6 Added 'Download' button to snippet view Merge branch 'api-fix-project-group-sharing' into 'security' Add 8.12.5, 8.11.9, and 8.10.12 CHANGELOG entries FIx JS bug with select2 because of missing `data-field` attribute in select box. Remove pointless `.vagrant_enabled` file allow multiple labels commands Move some CHANGELOG entries to the 8.13.0 part Move operations/ to new location Move health check docs under user/admin_area/monitoring Make guests unable to view MRs Add examples of fake tokens to be used in docs Remove duplicate CHANGELOG entry Allow browsing branches that end with '.atom' Refactor the SubGit/SVN documentation Document the new CI_DEBUG_TRACE variable Remove redundant images changed the scss for the top line connectors to be exactly centered Rearrange GitLab basics READMEs New images for GitLab basics "Create MR" docs ... Conflicts: app/models/commit_status.rb
| * | | | Update documentation according to changes in MWBSGrzegorz Bizon2016-10-071-10/+10
| | | | |
* | | | | Merge branch 'es6-es5-poltergeist' into 'master' Fatih Acet2016-10-121-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document Capybara errors from es6 in es5 file. ## What does this MR do? Documents an error that I've banged my head against twice now. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The greater good. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6836
| * | | | | Document Capybara errors from es6 in es5 file.es6-es5-poltergeistBryce Johnson2016-10-121-0/+11
| | | | | |
* | | | | | Merge branch 'mrchrisw/fix-debug-token' into 'master' Stan Hu2016-10-121-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix step number and token param in URL example. Fix gitlab-rails command code formatting. See merge request !6791
| * | | | | Fix step number and token param in URL example. Fix gitlab-rails command ↵mrchrisw/fix-debug-tokenChris Wilson2016-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | code formatting.
* | | | | | Merge branch 'api-version' into 'master' Robert Speicher2016-10-122-0/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Version information ## What does this MR do? Adds a new endpoint to retrieve the version information. ## Why was this MR needed? Clients can now use this information to enable/disable certain API features depending on the version. ## What are the relevant issue numbers? Closes #22608, https://gitlab.com/gitlab-org/gitlab-ce/issues/23148 See merge request !6822
| * | | | | API: Version informationapi-versionRobert Schilling2016-10-122-0/+24
| | |_|_|/ | |/| | |
* | | | | Merge branch '17541-move-licenses-api-endpoint-to-templates-licenses' into ↵Rémy Coutable2016-10-124-5/+706
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Move `/licenses` api endpoint to `/templates/licenses`" ## What does this MR do? It moves the `/licenses`, `/gitignores` and `/gitlab_ci_ymls` API endpoints under the `/templates` namespace ## Why was this MR needed? In EE we now have somewhat ambiguous API endpoints. `/license` refers to the EE license while `/licenses` (plural) refers to license templates. @DouweM mentioned that we're adding .gitignore templates in #14106 so it may make sense to add a /templates namespace. Then, move the /license templates endpoint to be underneath, along with .gitignore endpoints. Closes #17541 See merge request !5717
| * | | | | Create a new /templates API namespaceThomas Balthazar2016-10-124-5/+706
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | The /licenses, /gitignores and /gitlab_ci_ymls endpoints are now also available under a new /templates namespace. Old endpoints will be deprecated when GitLab 9.0.0 is released.
* | | | | Added documentation chapter for Git attributesYorick Peterse2016-10-122-0/+23
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in https://gitlab.com/gitlab-org/gitlab_git/issues/28 we'll need to clearly document the need for .gitattributes files being encoded using UTF-8. [ci skip]
* | | | Merge branch 'user-events-api' into 'master' Robert Speicher2016-10-122-1/+147
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: New /users/:id/events endpoint ## What does this MR do? If add a new `/users/:id/events` endpoint to retrieve a user's contribution events. The events returned are filtered so that only the events for projects that the current user can see are returned (similarly to what we do at the controller level). ## Why was this MR needed? Because it's a nice feature to calculate leaderboards, for instance for #17815. ## What are the relevant issue numbers? Closes #20866. See merge request !6771
| * | | Addresses Robert's feedbackRémy Coutable2016-10-112-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>