summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-302-8/+8
|
* Added CHANGELOG, documentation, and API functionalityPatricio Cano2016-08-302-0/+11
|
* Merge branch 'docs-update_gitlab_workhorse_for_8.11' into 'master' Achilleas Pipinellis2016-08-301-1/+1
|\ | | | | | | | | | | | | | | | | | | docs: make sure to update 8.10-to-8.11 workhorse version too (see !5983) ## What does this MR do? Make sure to remember the correct workhorse version for specific version update instructions for those of us still doing source installs. Related to !5983. See merge request !6049
| * docs: make sure to update 8.10-to-8.11 workhorse version too (see !5983)Bjørn Øivind Bjørnsen2016-08-261-1/+1
| |
* | Merge branch 'patch-5' into 'master' Achilleas Pipinellis2016-08-301-30/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | Update projects.md ## What does this MR do? Repaired some examples for a branches in projects.md See merge request !6018
| * | Update projects.md Miroslav Meca2016-08-251-30/+24
| | | | | | | | | | | | | | | | | | | | | The wrong example for "Branches". Added option parameters in protect branch section. Here is reason: https://gitlab.com/gitlab-org/gitlab-ee/commit/3ab07b8aae8dae43cfa3aae1306c59ea264a8594 Maybe this section could/should be deleted. Because in file repositories.md it had been deleted: https://gitlab.com/gitlab-org/gitlab-ee/commit/8f3701eff005aeedcebff8ce02074f5056a369b3
* | | Merge branch 'patch-1' into 'master' Douwe Maan2016-08-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify blank line rule in newlines_styleguide.md ## What does this MR do? * Corrects a typo in the GitLab Ruby newlines style guide * Makes some vague language in the original guideline more precise ## Are there points in the code the reviewer needs to double check? n/a ## Why was this MR needed? * There was a typo in the original text. * The original text was vague. ## What are the relevant issue numbers? n/a ## Screenshots (if relevant) n/a ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added (Is this recommended for this kind of patch?) - ~~[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~~ - [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 !6048
| * | | Clarify blank line rule in newlines_styleguide.md Jake Romer2016-08-261-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To clarify what's meant by "from a logical perspective" here, I consulted Python's PEP8 style guide, which provides some helpfully precise language: > Extra blank lines may be used (sparingly) to separate groups of > related functions. Blank lines may be omitted between a bunch of > related one-liners (e.g. a set of dummy implementations). https://www.python.org/dev/peps/pep-0008/#blank-lines I adapted this passage to the existing language for the newline rule.
* | | Merge branch 'rdoursenaud/gitlab-ce-omniauth-bitbucket' into 'master' Achilleas Pipinellis2016-08-304-74/+145
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Bitbucket OmniAuth documentation ## What does this MR do? Updates the Bitbucket integration documentation. ## Why was this MR needed? Current documentation is out of date and very confusing. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2137 and https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1052. See merge request !6106
| * | | More Bitbucket integration refactoringrdoursenaud/gitlab-ce-omniauth-bitbucketAchilleas Pipinellis2016-08-303-39/+50
| | | |
| * | | Refactor Bitbucket integration documentationAchilleas Pipinellis2016-08-302-75/+119
| | | |
| * | | Updated Bitbucket OmniAuth documentation for omnibus packageRaphaël Doursenaud2016-08-301-2/+10
| | | |
| * | | Updated Bitbucket OmniAuth documentationRaphaël Doursenaud2016-08-301-3/+11
| | | |
* | | | Merge branch 'fix/ci-config-hidden-key-validation' into 'master' Douwe Maan2016-08-301-9/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not enforce using a hash with hidden ci key ## What does this MR do? This MR remove the validation rule that was to strict. ## Why was this MR needed? Enforcing hidden CI job configuration to be a hash, narrows options of using YAML anchors, and was not backwards compatbile. ## 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 - [x] 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) ## What are the relevant issue numbers? Closes #21512 See merge request !6079
| * | | | Update documentation about hidden keys in CI YAMLGrzegorz Bizon2016-08-291-9/+12
| | | | |
* | | | | Mention that the `:id` of a project can also be `NAMESPACE/PROJECT_NAME`Achilleas Pipinellis2016-08-302-18/+18
| |/ / / |/| | | | | | | | | | | [ci skip]
* | | | Merge branch 'doc/styleguide-fix-grep' into 'master' Achilleas Pipinellis2016-08-291-8/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify steps when changing a document's location Clarify the steps needed to change a document's location so issues like https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6024 don't occur. See merge request !6070
| * | | | Use `git grep` instead of `grep`Achilleas Pipinellis2016-08-291-7/+7
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Clarify steps when changing a document's locationdoc/styleguide-fix-grepAchilleas Pipinellis2016-08-271-8/+16
| | |/ / | |/| | | | | | | | | | [ci skip]
* | | | Add angle brackets around due date in slash cmds docsdoc/fix-due-date-in-slash-commandsGrzegorz Bizon2016-08-291-1/+1
| | | |
* | | | Fix due date example in slash commands documentationGrzegorz Bizon2016-08-291-1/+1
| |/ / |/| |
* | | Merge branch 'fix-markdown-help-references' into 'master' Achilleas Pipinellis2016-08-272-11/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown help references ## What does this MR do? Replaces all `markdown/markdown` references with `user/markdown` since `markdown/markdown.md` has been replaced with `user/markdown.md` ## Are there points in the code the reviewer needs to double check? Shouldn't be any :smile: ## Why was this MR needed? So that users who click on markdown help don't have to click/redirect to another link to get to the markdown help page ## What are the relevant issue numbers? Closes #21434 ## Screenshots (if relevant) ``` $git grep markdown/markdown app/helpers/search_helper.rb:47: { category: "Help", label: "Markdown Help", url: help_page_path("markdown/markdown") }, app/views/admin/appearances/_form.html.haml:16: Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('markdown/markdown'), target: '_blank'}. app/views/help/ui.html.haml:552: You can check how markdown rendered at #{link_to 'Markdown help page', help_page_path("markdown/markdown")}. doc/development/doc_styleguide.md:425:[gfm]: http://docs.gitlab.com/ce/markdown/markdown.html#newlines "GitLab flavored markdown documentation" doc/user/markdown.md:69:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#newlines doc/user/markdown.md:89:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#multiple-underscores-in-words doc/user/markdown.md:104:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#url-auto-linking doc/user/markdown.md:125:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#multiline-blockquote doc/user/markdown.md:159:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#code-and-syntax-highlighting doc/user/markdown.md:229:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#inline-diff doc/user/markdown.md:245:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#emoji doc/user/markdown.md:310:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#task-lists doc/user/markdown.md:333:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#videos doc/user/markdown.md:783:[markdown.md]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md spec/routing/routing_spec.rb:110: path = '/help/markdown/markdown.md' spec/routing/routing_spec.rb:112: path: 'markdown/markdown', ``` ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 !6024
| * | | Fix markdown help referencesClement Ho2016-08-262-11/+11
| |/ /
* | | Merge branch 'patch-5' into 'master' Achilleas Pipinellis2016-08-261-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pipelines.md ## What does this MR do? attempt to solve: https://gitlab.com/gitlab-org/gitlab-ce/commit/a03cadcdbf3024ec59234a07a9b87884de5cc7dc#note_14172234 the word isn't visible anyway, don't know what original author intended to say. at least it fixes the `stages` link now. ## 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) See merge request !6040
| * | | doc: fix (batches) being treated as link reference rather than textElan Ruusamäe2016-08-261-1/+1
| |/ /
* | | Fix `Stack Build` wizard description in koding.mdFederico "Lox2016-08-251-1/+1
|/ /
* | Merge branch ↵Robert Speicher2016-08-251-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master' Handle non-UTF-8 conflicts gracefully ## What does this MR do? If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI. ## What are the relevant issue numbers? Closes #21247. See merge request !5961
| * | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | These can't be resolved in the UI because if they aren't in a UTF-8 compatible encoding, they can't be rendered as JSON. Even if they could, we would be implicitly changing the file encoding anyway, which seems like a bad idea.
* | | Merge branch ↵Robert Speicher2016-08-251-4/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21257-label-lists-should-shows-opened-or-closed-issues-with-that-label' into 'master' Label list shows all issues (opened or closed) with that label ## What does this MR do? Change the label list to shows all issues (opened or closed) with that label. ## What are the relevant issue numbers? Closes #21257 See merge request !5991
| * | | Update Issue board documentationDouglas Barbosa Alexandre2016-08-251-4/+3
| | |/ | |/|
* | | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitorious ## What does this MR do? Remove gitorious as import source ## Are there points in the code the reviewer needs to double check? Did I remove everything? ## Why was this MR needed? This button yielded a 404 ## What are the relevant issue numbers? Closes #17062 /cc @JobV See merge request !5866
| * | | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-1/+1
| | |/ | |/|
* | | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-253-0/+117
|\ \ \
| * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-2221-10/+379
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1933-27/+1018
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fix merge request versions api docDmitriy Zaporozhets2016-08-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-15104-1834/+3087
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add documentation for merge request versionsDmitriy Zaporozhets2016-08-122-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add single merge request diff API endpointDmitriy Zaporozhets2016-08-121-29/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Fix project id param for merge request version APIDmitriy Zaporozhets2016-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Update merge request versions API to match styleguideDmitriy Zaporozhets2016-08-031-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add API to list merge request diff versionsDmitriy Zaporozhets2016-08-031-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'doc/fix-koding-integration-link' into 'master' Achilleas Pipinellis2016-08-252-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong Koding link See merge request !6030
| * | | | | | | Fix wrong Koding linkdoc/fix-koding-integration-linkAchilleas Pipinellis2016-08-252-2/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'doc/fix-link-in-doc-styleguide' into 'master' Achilleas Pipinellis2016-08-251-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown link in doc_styleguide.md See merge request !6021
| * | | | | | Fix markdown link in doc_styleguide.mdAchilleas Pipinellis2016-08-251-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'doc/update-issue-board-img' into 'master' Achilleas Pipinellis2016-08-251-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new image for Issue Board page Replace the Issue Board image with a new one See merge request !6013
| * | | | | Use new image for Issue Board pageAchilleas Pipinellis2016-08-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | removed redundant wordJürgen Steinblock2016-08-251-1/+1
| | | | | |
* | | | | | Add two factor recovery endpoint to internal APIDrew Blessing2016-08-243-0/+72
| | | | | |