summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Add an example of how to run the backups when using docker to the docsbackup-docker-docsDJ Mountney2016-10-211-0/+4
|
* Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-3/+3
|\ | | | | | | | | | | | | Grammar fixes in docs Some minor grammar fixes in a page in the docs See merge request !6645
| * Grammar fixes in docsWilfred Hughes2016-10-031-3/+3
| |
* | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Changed gitlab-shell version to avoid warning when precompiling the assets. ## What does this MR do? Changes installation instructions from source to install v3.6.1 of gitlab-shell to avoid a pre-compile warning on gitlab. See merge request !6747
| * | Changed gitlab-shell version to avoid warning when precompiling the assets.Ismael Arenzana2016-10-071-1/+1
| | |
* | | Merge branch 'master' into 'master' Rémy Coutable2016-10-211-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Documentation image when configuring Build emails in Services ## What does this MR do? Replace old GitLab image in documentation with a new image showing the new position of Services and the module 'Build emails' ## Why was this MR needed? GitLab's layout changed with version 8.9 and the buttons were moved. See merge request !5139
| * | | Replace builds_emails_service.png to fit to new layout of GitLabChristian Meter2016-07-071-0/+0
| | | |
* | | | 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
| * | | | Fix `ref` parameter name for `commits/statuses` Pierre de La Morinerie2016-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'edit-glossary' into 'master' Sean Packham2016-10-211-139/+246
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit glossary Grammar fixes & new additions to the glossary page. See merge request !7027
| * | | | | added skipped definitionedit-glossaryevhoffmann2016-10-201-0/+2
| | | | | |
| * | | | | updated some links in definitionsevhoffmann2016-10-201-11/+23
| | | | | |
| * | | | | a round of terms and editsevhoffmann2016-10-191-137/+230
| | | | | |
* | | | | | Remove pagination description from individual docTakuya Noguchi2016-10-201-2/+0
| | | | | |
* | | | | | Fix a broken table in Project API docTakuya Noguchi2016-10-201-4/+4
| | | | | |
* | | | | | Fix import/export labels to cope with project and group labels. Added ↵James Lopez2016-10-191-1/+2
|/ / / / / | | | | | | | | | | | | | | | relevant specs.
* | | | | Merge branch 'fix-system-hook-api' into 'master' Rémy Coutable2016-10-191-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
| * | | | | API: Fix Sytem hooks delete behaviorfix-system-hook-apiRobert Schilling2016-10-141-5/+2
| | | | | |
* | | | | | 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
| | | | | | | | |