summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Fix markdown in various docsMarcel Amirault2019-08-2829-94/+68
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up issues that may cause the docs-lint test to fail, such as trailing whitespace, no EOF newline, blockquotes, etc
* | | | | | | Merge branch 'docs/fix-introduced-in-text' into 'master'Achilleas Pipinellis2019-08-288-27/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Introduced in text for our renderer See merge request gitlab-org/gitlab-ce!32308
| * | | | | | | Fixes Introduced in text for our rendererEvan Read2019-08-288-27/+28
|/ / / / / / /
* | | | | | | Merge branch 'mk/remove-jwt-from-rate-limit-docs' into 'master'Evan Read2019-08-282-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note CI token exception to JWT requests in rate limit docs See merge request gitlab-org/gitlab-ce!32168
| * | | | | | | Note some JWT requests aren't rate limitedmk/remove-jwt-from-rate-limit-docsMichael Kozono2019-08-232-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'todos/include-issue-mr-titles' into 'master'Stan Hu2019-08-2810-60/+90
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Issue and Merge Request titles to Todo items Closes #63488 See merge request gitlab-org/gitlab-ce!30435
| * | | | | | | Add Issue and Merge Request titles to Todo itemsArun Kumar Mohan2019-08-2710-60/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only displays the todo body if the todo has a note. This is to avoid redundant Issue or Merge Request titles displayed both in the Todo title and body.
* | | | | | | | Merge branch 'qa-restric-access-by-ip-address-spec-ce' into 'master'Sanad Liaquat2019-08-286-4/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport of EE changes See merge request gitlab-org/gitlab-ce!32203
| * | | | | | | | CE Backport of EE changesqa-restric-access-by-ip-address-spec-ceSanad Liaquat2019-08-276-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qa selector elements and files from the EE branch
* | | | | | | | | Merge branch 'docs-patch-74' into 'master'Evan Read2019-08-281-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove eks from adding an existing cluster section See merge request gitlab-org/gitlab-ce!32125
| * | | | | | | | | Remove eks from adding an existing cluster sectionDaniel Gruesso2019-08-281-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ss/add-board-name-to-page-title' into 'master'Mike Greiling2019-08-282-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ss/add board name to page title See merge request gitlab-org/gitlab-ce!32074
| * | | | | | | | | Ss/add board name to page titleScott Stern2019-08-282-1/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-gitlab-basics-followup' into 'master'Evan Read2019-08-283-4/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolving minor formatting issues in gitlab-basics Closes #65307 See merge request gitlab-org/gitlab-ce!32194
| * | | | | | | | | Resolving minor formatting issues in gitlab-basicsMarcel Amirault2019-08-283-4/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ce-refactor-dev-org-com-helper' into 'master'Ash McKenzie2019-08-282-1/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename dev, org, com helper See merge request gitlab-org/gitlab-ce!32115
| * | | | | | | | | Rename dev, org, com helperDoug Stull2019-08-282-1/+28
|/ / / / / / / / /
* | | | | | | | | Merge branch '10688-group-maintainers-edit-epic-comments-permissions-docs' ↵Evan Read2019-08-281-18/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update group permissions table documentation See merge request gitlab-org/gitlab-ce!32020
| * | | | | | | | | Update group permissions table documentationEugenia Grieff2019-08-281-18/+20
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/66091-change-mattermost-version-reference' into 'master'Evan Read2019-08-281-2/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66091 Closes #66091 See merge request gitlab-org/gitlab-ce!32188
| * | | | | | | | | Change reference to Mattermost versions.Russell Dickenson2019-08-281-2/+7
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed reference to Mattermost versions, so that it's clear which menu navigation path applies.
* | | | | | | | | Merge branch 'load-balancing-prometheus' into 'master'Evan Read2019-08-271-1/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for db_load_balancing metrics See merge request gitlab-org/gitlab-ce!32044
| * | | | | | | | | Add docs for db_load_balancing metricsload-balancing-prometheusThong Kuah2019-08-271-1/+10
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-rate-limits-qa' into 'master'Mark Lapierre2019-08-279-7/+109
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QA specs for using IP rate limits See merge request gitlab-org/gitlab-ce!32177
| * | | | | | | | | | Add QA specs for using IP rate limitssh-rate-limits-qaStan Hu2019-08-269-7/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help prevent issues such as https://gitlab.com/gitlab-org/gitlab-ce/issues/66449.
* | | | | | | | | | | Merge branch 'sh-document-qa-admin-account-docs' into 'master'Mark Lapierre2019-08-271-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document setting admin credentials in QA tests See merge request gitlab-org/gitlab-ce!32271
| * | | | | | | | | | | Document setting admin credentials in QA testssh-document-qa-admin-account-docsStan Hu2019-08-271-0/+11
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to test against a real instance that has different admin credentials than the default.
* | | | | | | | | | | Merge branch '13353-DesignType-notes_count-ce' into 'master'Mayra Cabrera2019-08-276-54/+84
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!15433 (Expose DesignType#notes_count in GraphQL) See merge request gitlab-org/gitlab-ce!32037
| * | | | | | | | | | CE-specific changes for designs `user_notes_count`Luke Duncalfe2019-08-276-54/+84
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes call `#after_note_created` and `#after_note_destroyed` on their noteable in callbacks, so the noteable can perform tasks particular to them, like cache expiry. This is in preparation of the EE-specific class `DesignManagement::Design` clearing its `user_notes_count` cache when its note are created or destroyed. Refactoring Rspec behaviour testing of a counter caching service into a shared example. https://gitlab.com/gitlab-org/gitlab-ee/issues/13353
* | | | | | | | | | Merge branch 'sh-fix-docs-lint-snippets-docs' into 'master'Mayra Cabrera2019-08-271-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace from project snippets API docs Closes #66677 See merge request gitlab-org/gitlab-ce!32298
| * | | | | | | | | | Remove trailing whitespace from project snippets API docssh-fix-docs-lint-snippetsStan Hu2019-08-271-2/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66677
* | | | | | | | | | Merge branch ↵Clement Ho2019-08-272-0/+33
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60141-mr-resolve-conflicts-file-headers-bad-positioning-on-scroll' into 'master' Resolve "MR resolve conflicts file headers bad positioning on scroll" Closes #60141 See merge request gitlab-org/gitlab-ce!31991
| * | | | | | | | | | Round the file title; Add top border to conflict diffsThomas Randolph2019-08-272-0/+33
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file title sometimes overflows its container, which has the same border-radius. By always rounding the file title, the overflow never happens, so the corners always look correct. Everywhere else there are file diffs, there is a top border to complete the full border around the file.
* | | | | | | | | | Merge branch 'fix-nil-error-in-gitlab-danger-teammate' into 'master'Lin Jen-Shin2019-08-272-2/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a nil error in Gitlab::Danger::Teammate See merge request gitlab-org/gitlab-ce!32284
| * | | | | | | | | Fix a nil error in Gitlab::Danger::TeammateRémy Coutable2019-08-272-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'docs/update-api-snippets' into 'master'Achilleas Pipinellis2019-08-271-0/+58
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add example requests for snippets API See merge request gitlab-org/gitlab-ce!31964
| * | | | | | | | | Add example requests for snippets APIRainer Kern2019-08-271-0/+58
|/ / / / / / / / /
* | | | | | | | | Merge branch 'qa-autodevops-smoke-check' into 'master'Dan Davison2019-08-274-12/+36
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure autodevops is enabled before running Smoke test See merge request gitlab-org/gitlab-ce!31867
| * | | | | | | | | Ensure autodevops is enabled before running Smoke testqa-autodevops-smoke-checkddavison2019-08-154-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract #enable_autodevops to new page object Change Smoke test naming to only running pipeline Generate AutoDevOps project with SecureRandom suffix
* | | | | | | | | | Merge branch 'docs-document-category-labels' into 'master'Achilleas Pipinellis2019-08-274-134/+195
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation of stage, group, category, feature labels See merge request gitlab-org/gitlab-ce!32053
| * | | | | | | | | | Introduce facet labelsdocs-document-category-labelsRémy Coutable2019-08-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Improve documentation of stage, group, category, feature labelsRémy Coutable2019-08-274-138/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'ashmckenzie/remove-mdl-gem' into 'master'Achilleas Pipinellis2019-08-272-11/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the mdl gem as it's no longer in use See merge request gitlab-org/gitlab-ce!32253
| * | | | | | | | | | | Remove the mdl gem as it's no longer in useashmckenzie/remove-mdl-gemAsh McKenzie2019-08-272-11/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'qa/issue-boards-navigation' into 'master'Sanad Liaquat2019-08-272-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update view for testability and update page object See merge request gitlab-org/gitlab-ce!32224
| * | | | | | | | | | | Update issues submenuqa/issue-boards-navigationWalmyr Lima2019-08-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a new element and a new method to go to issue boards.
| * | | | | | | | | | | Update view to add testabilityWalmyr Lima2019-08-261-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'remove-docker-tag-for-reports-jobs' into 'master'Nick Thomas2019-08-271-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't set tags for the reports jobs See merge request gitlab-org/gitlab-ce!32276
| * | | | | | | | | | | | Don't set tags for the reports jobsremove-docker-tag-for-reports-jobsRémy Coutable2019-08-271-3/+0
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'winh-prepend-entity' into 'master'Yorick Peterse2019-08-272-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace prepend_entity with prepend_if_ee helper Closes gitlab-ee#13639 See merge request gitlab-org/gitlab-ce!32214