summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'docs-document_new_reports_syntax-ce' into 'master'winh-before-frontend-testing-categories-docsAchilleas Pipinellis2018-11-135-64/+318
|\ | | | | | | | | Document new report types See merge request gitlab-org/gitlab-ce!22828
| * Document new report typesOlivier Gonzalez2018-11-135-64/+318
|/
* Merge branch 'qa-auto-assign-codeowner-spec' into 'master'Grzegorz Bizon2018-11-133-4/+16
|\ | | | | | | | | Update merge request page object and selectors See merge request gitlab-org/gitlab-ce!22939
| * Update merge request page object and selectorsqa-auto-assign-codeowner-specMark Lapierre2018-11-093-4/+16
| | | | | | | | | | These are changes from EE that are also relevant to CE from: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8372
* | Merge branch 'docs-eks-updates' into 'master'Achilleas Pipinellis2018-11-132-23/+94
|\ \ | | | | | | | | | | | | Update eks guide to include admin token creation. See merge request gitlab-org/gitlab-ce!22926
| * | Update eks guide to include admin token creation.Daniel Gruesso2018-11-132-23/+94
|/ /
* | Merge branch 'refactor-reference-regexes-and-identity-scopes' into 'master'Robert Speicher2018-11-135-17/+30
|\ \ | | | | | | | | | | | | Refactor reference regexes and identity scopes See merge request gitlab-org/gitlab-ce!22987
| * | Move Identity.uniqueness_scope to a modulerefactor-reference-regexes-and-identity-scopesYorick Peterse2018-11-122-6/+13
| | | | | | | | | | | | | | | | | | Moving this method to a separate module looks a bit odd, but it allows for EE to extend the method without also having to redefine a variety of validation rules.
| * | Turn reference regex constants into methodsYorick Peterse2018-11-123-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Mentionable::ReferenceRegexes` used to define the following two constants: 1. DEFAULT_PATTERN 2. EXTERNAL_PATTERN These two constants were built using some of the class methods that reside in this same module. In EE we redefine one of these methods by using `prepend` at the start of the `ReferenceRegexes` module. This poses a problem: we can not move the `prepend` to the end of the file, because the constants later on depend on it. To resolve this problem, this commit turns these constants into class methods that memoize their results. This allows EE to redefine the appropriate methods before these two class methods are used, in turn allowing us to move the `prepend` to the end of the file. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8198 for more information.
* | | Merge branch 'docs/fix-ordered-list-item-prefix' into 'master'Achilleas Pipinellis2018-11-1356-356/+361
|\ \ \ | | | | | | | | | | | | | | | | Resolve Markdown ordered lists not conforming to styleguide See merge request gitlab-org/gitlab-ce!23007
| * | | Resolve Markdown ordered lists not conforming to styleguidedocs/fix-ordered-list-item-prefixEvan Read2018-11-1356-356/+361
| | | |
* | | | Merge branch 'archive-builds-documentation' into 'master'Achilleas Pipinellis2018-11-132-5/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for archive builds Closes #53534 See merge request gitlab-org/gitlab-ce!22909
| * | | | Update docsarchive-builds-documentationKamil Trzciński2018-11-132-16/+16
| | | | |
| * | | | Add documentation for archive buildsKamil Trzciński2018-11-092-5/+21
| | | | |
* | | | | Merge branch 'kubernetes-http-response-code' into 'master'Kamil Trzciński2018-11-1314-42/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show HTTP response code for Kubernetes errors Closes #53628 See merge request gitlab-org/gitlab-ce!22964
| * | | | | Show HTTP response code for Kubernetes errorsThong Kuah2018-11-1314-42/+68
|/ / / / /
* | | | | Merge branch 'leipert-upgrade-node-yarn' into 'master'Tim Zallmann2018-11-132-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to node v10.x and yarn 1.12.x See merge request gitlab-org/gitlab-ce!22979
| * | | | | Upgrade to node v10.xleipert-upgrade-node-yarnLukas Eipert2018-11-122-4/+4
| | | | | |
* | | | | | Merge branch 'remove-mr-version-controls-form-fixed-width-container' into ↵Phil Hughes2018-11-131-6/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' remove .mr-version-controls from .fixed-with-container See merge request gitlab-org/gitlab-ce!23003
| * | | | | | remove .mr-version-controls from .fixed-with-containerOren Aksakal2018-11-121-6/+0
| | | | | | |
* | | | | | | Merge branch 'docs-fl-define-vuejs-expert-role' into 'master'Tim Zallmann2018-11-131-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defines Vue.js Expert Role See merge request gitlab-org/gitlab-ce!21922
| * | | | | | | Updates wordingdocs-fl-define-vuejs-expert-roleFilipa Lacerda2018-09-261-3/+3
| | | | | | | |
| * | | | | | | Defines Vue.js Expert RoleFilipa Lacerda2018-09-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we have a vue.js expert role that is not defined By defining this role we can improve our Vue and Vuex code.
* | | | | | | | Merge branch 'docs-update-api-path' into 'master'Achilleas Pipinellis2018-11-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update the part to Google+ API See merge request gitlab-org/gitlab-ce!23014
| * | | | | | | | update the part to Google+ APIAlexander Tanayno2018-11-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '53879-kube-token-nil' into 'master'Kamil Trzciński2018-11-137-4/+65
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deployment jobs using nil token Closes #53879 See merge request gitlab-org/gitlab-ce!23009
| * | | | | | | | Fix deployment jobs using nil tokenThong Kuah2018-11-137-4/+65
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-29' into 'master'Phil Hughes2018-11-131-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix help text in Admin Area > Background Jobs See merge request gitlab-org/gitlab-ce!19208
| * | | | | | | | Fix help text in Admin Area > Background JobsMax Vogler2018-11-131-1/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'zj-remove-broken-storage' into 'master'Douwe Maan2018-11-132-37/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete gitlab_shell checks See merge request gitlab-org/gitlab-ce!22417
| * | | | | | | | Migrate storage checks to GitalyZeger-Jan van de Weg2018-11-092-37/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these checks are not valuable in the current setup, thus removed and replaced by Gitaly checking if its read and writeable. Depends on: 1. https://gitlab.com/gitlab-org/gitaly/merge_requests/675
* | | | | | | | | Merge branch '53888-missing-favicon' into 'master'Phil Hughes2018-11-132-2/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds back missing CI favicon Closes #53888 See merge request gitlab-org/gitlab-ce!23002
| * | | | | | | | | Adds back missing CI favicon53888-missing-faviconFilipa Lacerda2018-11-122-2/+7
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CI favicon was missing in the jobs page. This commit fixes it. Closes #53888
* | | | | | | | | Merge branch '53289-update-haml_lint-to-0-28-0' into 'master'Rémy Coutable2018-11-134-7/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update haml_lint to 0.28.0 Closes #53289 See merge request gitlab-org/gitlab-ce!22660
| * | | | | | | | | Update haml_lint to 0.28.0Takuya Noguchi2018-10-294-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | Merge branch '53291-update-ffaker-to-2-10-0' into 'master'Rémy Coutable2018-11-134-5/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ffaker to 2.10.0 Closes #53291 See merge request gitlab-org/gitlab-ce!22661
| * | | | | | | | | | Update ffaker to 2.10.0Takuya Noguchi2018-10-294-5/+10
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | Merge branch 'ashmckenzie/hmac-token-decode-and-tests' into 'master'Stan Hu2018-11-134-2/+173
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relocate JSONWebToken::HMACToken from EE See merge request gitlab-org/gitlab-ce!22906
| * | | | | | | | | | Relocate JSONWebToken::HMACToken from EEashmckenzie/hmac-token-decode-and-testsAsh McKenzie2018-11-134-2/+173
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '53894-docs-update-adding-project-txt-to-match-up-with-image' ↵Evan Read2018-11-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Docs update - adding project txt to match up with image" Closes #53894 See merge request gitlab-org/gitlab-ce!23008
| * | | | | | | | | | | Adding what Projects permission is needed as text to match up with the image.53894-docs-update-adding-project-txt-to-match-up-with-imageastrachan2018-11-131-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-quality/team-tasks-24' into 'master'Mek Stittri2018-11-133-52/+119
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the 'Testing levels' documentation Closes gitlab-org/quality/team-tasks#24 See merge request gitlab-org/gitlab-ce!21505
| * | | | | | | | | | Improve the 'Testing levels' documentationdocs-quality/team-tasks-24Rémy Coutable2018-11-063-52/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'align-vertical-discussion-line' into 'master'Fatih Acet2018-11-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align all avatars and system notes in discussion See merge request gitlab-org/gitlab-ce!22994
| * | | | | | | | | | Align all avatars and system notes in discussionalign-vertical-discussion-lineAnnabel Dunstone Gray2018-11-121-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ce-3777-promote-to-epic' into 'master'Rémy Coutable2018-11-1216-411/+594
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring Issues::MoveService (port of promote epics) See merge request gitlab-org/gitlab-ce!22766
| * | | | | | | | | | | Extract code from Issues::MoveServicece-3777-promote-to-epicJarka Košanová2018-11-1216-411/+594
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract code to make it easier reusable - introduce AttributesRewriter and ContentRewriter - support group entites when rewriting content - make Uploader copy_to working for Namespaces
* | | | | | | | | | | Merge branch 'fix-tags-for-envs' into 'master'Stan Hu2018-11-123-7/+18
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tags for environments Closes gitlab-ee#8397 See merge request gitlab-org/gitlab-ce!22993
| * | | | | | | | | | | Fix non-hacking wayKamil Trzciński2018-11-122-2/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Revert "Just fix (hack) specs"Kamil Trzciński2018-11-124-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c739b8e0d6258276100da68c2ba1e2ecb7e8bde1.