summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'doc/extend-code-review-guidelines' into 'master' Robert Speicher2016-12-021-0/+26
|\ | | | | | | | | | | | | Extend code review docs with chapter about the right balance [ci skip] See merge request !7838
| * Remove change to MWBS in code review guidelineGrzegorz Bizon2016-12-021-1/+1
| | | | | | | | [ci skip]
| * Copy-edit text about right balance in code reviewsdoc/extend-code-review-guidelinesGrzegorz Bizon2016-12-011-10/+10
| | | | | | | | [ci skip]
| * Extend code review docs with chapter about the right balanceGrzegorz Bizon2016-11-301-1/+27
| |
* | Merge branch 'remove-gitlab-workhorse-version-option-from-install-task' into ↵Robert Speicher2016-12-022-16/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't allow to specify a repo or version when installing Workhorse I've also updated the "patch version upgrade" doc since I did forget to update it in !6574. See merge request !7879
| * | Don't allow to specify a repo or version when installing Workhorseremove-gitlab-workhorse-version-option-from-install-taskRémy Coutable2016-12-012-16/+3
| | | | | | | | | | | | | | | | | | The task will use the canonical repo and the required version. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '22781-user-generated-permalinks' into 'master' Fatih Acet2016-12-011-48/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "User-generated permalink IDs collide with GitLab interface" ## What does this MR do? Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface. This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM. How this works: * All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"` * All anchor links which point to these IDs continue to use the non-namespaced hash `<a href="#foo">...</a>` * When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead. ## Before ![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif) ## After: ![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif) ![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [ ] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22781 See also prior attempts to address this issue: #3908, !2023, !2024 See merge request !7631
| * | remove id collision caveat from documentationMike Greiling2016-11-301-48/+0
| | |
* | | Merge branch 'docs/container-registry-2fa' into 'master' Achilleas Pipinellis2016-12-013-21/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document the need to use a PAT with Registry when 2FA is on Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22465 See merge request !7874
| * | | Document the need to use a PAT with Registry when 2FA is onAchilleas Pipinellis2016-12-013-21/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab 8.12 introduced a new permissions model which tightened the security of Container Registry. It is now required to use a personal token if 2FA is enabled. [ci skip]
* | | | Small refactor of webhooks docsAchilleas Pipinellis2016-12-012-35/+46
|/ / / | | | | | | | | | [ci skip]
* | | Merge branch 'docs/triggers-ref-clarify' into 'master' Achilleas Pipinellis2016-12-011-3/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify that a commit SHA doesn't work for CI triggers Related https://gitlab.com/gitlab-org/gitlab-ce/issues/22029 See merge request !7871
| * | | Clarify that a commit SHA doesn't work for CI triggersAchilleas Pipinellis2016-12-011-3/+7
| |/ / | | | | | | | | | [ci skip]
* | | Merge branch 'docs/fix-typo-build-artifacts' into 'master' Achilleas Pipinellis2016-12-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong link in builds artifacts admin docs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23168 See merge request !7870
| * | | Fix wrong link in builds artifacts admin docsAchilleas Pipinellis2016-12-011-1/+1
| |/ / | | | | | | | | | [ci skip]
* | | Merge branch '23718/backup-rake-task-human-readable' into 'master' Douwe Maan2016-12-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23718/backup rake task human readable ## What does this MR do? Add the human readable format to the backup tar file. From `1477317140_gitlab_backup.tar` to `1477317140_2016_10_24_gitlab_backup.tar`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? #23718 issue ## Screenshots (if relevant) ## 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] API support added - 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? 23718 See merge request !7188
| * | | Add Human Readable Timestamp to backup tar fileDavid Gerő2016-11-301-1/+1
| | |/ | |/|
* | | Merge branch ↵Robert Speicher2016-12-013-10/+222
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install' into 'master' New `gitlab:workhorse:install` rake task ## Why was this MR needed? Because with this we can remove the "Ensure the gitlab-workhorse version in Install gitlab-workhorse matches the required version." step from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1! MR is ready: gitlab-org/release-tools!57 Closes #22719 See merge request !6574
| * | Move task helpers to a module22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-installRémy Coutable2016-11-302-5/+5
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Add #run_command! to task helpers to raise a TaskFailedError if status is not 0Rémy Coutable2016-11-302-1/+203
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | New `gitlab:workhorse:install` rake taskRémy Coutable2016-11-302-10/+20
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'docs/git-submodules-with-ci' into 'master' Achilleas Pipinellis2016-11-304-110/+96
|\ \ | | | | | | | | | | | | | | | | | | Refactor the Git submodules with CI docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22567 See merge request !7856
| * | Refactor the Git submodules with CI docsAchilleas Pipinellis2016-11-304-110/+96
| |/ | | | | | | [ci skip]
* | Merge branch 'api-branch-status' into 'master' Rémy Coutable2016-11-301-0/+5
|\ \ | | | | | | | | | | | | | | | | | | API: Expose branch status Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938 See merge request !7796
| * | API: Expose branch statusapi-branch-statusRobert Schilling2016-11-301-0/+5
| | |
* | | Merge branch 'grapify-files-api' into 'master' Rémy Coutable2016-11-301-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Grapify the files API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7806
| * | | Grapify the files APIgrapify-files-apiRobert Schilling2016-11-301-2/+2
| |/ /
* | | Merge branch 'grapify-projects-api' into 'master' Rémy Coutable2016-11-301-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Grapify the projects API Related to #22928 See merge request !7456
| * | Grapify the projects APIgrapify-projects-apiRobert Schilling2016-11-281-0/+1
| |/
* | Merge branch 'add-stackprof' into 'master' Robert Speicher2016-11-301-0/+110
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add StackProf to the Gemfile, along with a utility to get a profile for a spec The test suite needs speeding up significantly. This is one tool for investigating it. Related to #23034 See merge request !7784
| * | Add StackProf to the Gemfile, along with a utility to get a profile for a specNick Thomas2016-11-291-0/+110
| |/
* | Merge branch 'docs/fix-bitbucket-integration-typos' into 'master' Achilleas Pipinellis2016-11-291-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix typos in Bitbucket integration docs [ci skip] See merge request !7823
| * | Fixing typo & Clarifying Key nameLee Matos2016-11-291-2/+2
| |/
* | Merge branch 'refactor-issuable-description-and-metadata' into 'master' Robert Speicher2016-11-291-29/+82
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor issuable description and metadata form sections Continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/23864. Brother of gitlab-org/gitlab-ee!916. See merge request !7758
| * | Refactor issuable description and metadata form sectionsrefactor-issuable-description-and-metadataRémy Coutable2016-11-251-29/+82
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Remove `memberOf` OID in LDAP `user_filter` docs ldap_user_filter_update2Drew Blessing2016-11-281-1/+1
| | | | | | | | | | | | | | | While not technically invalid, it is not necessary to have the `memberOf` OID in the `user_filter`. It clutters things up and causes confusion for users so it's better if we remove it from the docs.
* | | Add guidelines in doc linking with HAMLAchilleas Pipinellis2016-11-281-0/+71
| |/ |/| | | | | [ci skip]
* | [ci skip] UX Guide: Anchor hover guidance include color changeux-guide-anchor-hoverawhildy2016-11-262-13/+5
| | | | | | | | | | | | | | | | | | | | Primary and secondary links should be dark blue on hover Update anchor image to dark blue for secondary Clean up markdown Fix anchorlinks image
* | [ci skip] UX Guide: add guidance for max height for dropdownsux-guide-dropdown-max-heightawhildy2016-11-251-0/+2
| | | | | | | | Fix spelling
* | Merge branch 'workhorse-v1.0.1' into 'master' Rémy Coutable2016-11-252-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Workhorse to v1.0.1 v1.0.0 was wrongly tagged, causing compiled gitlab-workhorse binaries to misreport their version number. Closes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/77 See merge request !7759
| * | Update GitLab Workhorse to v1.0.1Nick Thomas2016-11-252-2/+2
| | | | | | | | | | | | | | | v1.0.0 was mistakenly tagged with a lightweight, rather than annotated, tag, which caused compiled versions of workhorse to wrongly report their version.
* | | Merge branch 'zj-expose-coverage-pipelines' into 'master' Rémy Coutable2016-11-251-6/+12
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Expose coverage on GET pipelines/:id Closes gitlab-org/gitlab-ce#24801 See merge request !7670
| * | Add docs for pipeline coverageZ.J. van de Weg2016-11-251-6/+12
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'issue-24534' into 'master' Rémy Coutable2016-11-2514-158/+44
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Remove unnecessary sentences for return codes in the API documentation Closes #24534 See merge request !7511
| * | Remove unnecessary sentences for status codes in the API documentationLuis Alonso Chavez Armendariz2016-11-2414-158/+44
| | |
* | | Merge branch 'issue_24748' into 'master' Fatih Acet2016-11-253-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix title case to sentence case in "Add Todo" ## What does this MR do? Implements sentence case for `Add Todo` ## Are there points in the code the reviewer needs to double check? I changed the images used in the file `doc/workflow/todos.md` to show the new look. ## Why was this MR needed? #24748 ## Screenshots (if relevant) Before ![Screen_Shot_2016-11-21_at_12.03.21_PM](/uploads/225abe2901aacccea697596853bdc52c/Screen_Shot_2016-11-21_at_12.03.21_PM.png) ![Screen_Shot_2016-11-21_at_11.58.17_AM](/uploads/3a5997eb6bb037f1c581d9925fa288ce/Screen_Shot_2016-11-21_at_11.58.17_AM.png) After ![Screen_Shot_2016-11-21_at_12.03.38_PM](/uploads/3be4d58e5adaa10fab759f8726a4d257/Screen_Shot_2016-11-21_at_12.03.38_PM.png) ![Screen_Shot_2016-11-21_at_11.58.37_AM](/uploads/016cdb32cb1e87e9e3cfd89309b53a4a/Screen_Shot_2016-11-21_at_11.58.37_AM.png) ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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) - [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? #24748 See merge request !7724
| * | | Fix title case to sentence caseLuis Alonso Chavez Armendariz2016-11-233-2/+2
| | | |
* | | | Merge branch 'rephrase-system-notes' into 'master' Robert Speicher2016-11-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rephrase some system notes to be compatible with new system note style See merge request !7692
| * | | | Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-241-1/+1
| | | | |
* | | | | Merge branch 'remove-backup-strategies' into 'master' Stan Hu2016-11-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop supporting Google Cloud and Azure as backup strategies ## What does this MR do? It removes support for Azure and Google Cloud as backup strategies (via Fog). Motivation behind this decision can be found in !4928, !6713 but basically they require a lot of gems that are unrelated to the backup use-case. ## Are there points in the code the reviewer needs to double check? Am I missing any other location where we'd use these gems? See merge request !7739