summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'ssot' into 'master'Sid Sijbrandij2019-04-182-20/+61
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssot as principle See merge request gitlab-org/gitlab-ce!27436
| * | | | | | | | | | | Fix anchor linksssotMike Lewis2019-04-171-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fix capitalization of termMike Lewis2019-04-171-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Reduce duplicate language by linking to a SSOTMike Lewis2019-04-171-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Resolve duplication of structure info by removing and linking to Style GuideMike Lewis2019-04-171-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Initial content editsMike Lewis2019-04-171-14/+15
| | | | | | | | | | | |
| * | | | | | | | | | | ssot as principleSid Sijbrandij2019-04-161-16/+58
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '10012-move-ee-diff-for-boards-issue-card-inner' into 'master'Phil Hughes2019-04-184-8/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace ee-specific code for boards/issue_card_inner Closes gitlab-ee#10012 See merge request gitlab-org/gitlab-ce!27394
| * | | | | | | | | | | | Replace ee-specific code for boards/issue_card_innerRoman Rodionov2019-04-184-8/+23
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fe-uninstall-cluster-apps' into 'master'Filipa Lacerda2019-04-187-58/+140
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display "Uninstall App" button if app is uninstallable Closes #60641 See merge request gitlab-org/gitlab-ce!27423
| * | | | | | | | | | | | Pass installed attribute to app_rowsfe-uninstall-cluster-appsEnrique Alcantara2019-04-181-0/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Show uninstall button when app is uninstallableEnrique Alcantara2019-04-183-13/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create empty uninstall_button component. - Add uninstallable property to application_row component. - Display Uninstall button if app is uninstallable and it is installed.
| * | | | | | | | | | | | Determine if app is installed in the storeEnrique Alcantara2019-04-175-53/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create installed property for cluster apps - Pass installed property to the application_row component
* | | | | | | | | | | | | Merge branch 'boards-stylelint' into 'master'Filipa Lacerda2019-04-1817-241/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stylelint rules in boards.scss Closes #59895 See merge request gitlab-org/gitlab-ce!27458
| * | | | | | | | | | | | | Fix stylelint rules in boards.scssPhil Hughes2019-04-1717-241/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59895
* | | | | | | | | | | | | | Merge branch 'if-57131-move_do' into 'master'Achilleas Pipinellis2019-04-183-0/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move external authorization doc to CE See merge request gitlab-org/gitlab-ce!27421
| * | | | | | | | | | | | | Move external authorization doc to CEImre Farkas2019-04-183-0/+112
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'an-use-labkit' into 'master'ce-xanf-add-links-to-admin-areaRémy Coutable2019-04-1841-1197/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate correlation and tracing code to LabKit See merge request gitlab-org/gitlab-ce!25379
| * | | | | | | | | | | | | Migrate correlation and tracing code to LabKitan-use-labkitAndrew Newdigate2019-04-1841-1197/+47
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a fairly straightforward refactor to extract the tracing and correlation-id code from the gitlab rails codebase into the new LabKit-Ruby project. The corresponding import into LabKit-Ruby was in https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1 The code itself remains very similar for now. Extracting it allows us to reuse it in other projects, such as Gitaly-Ruby. This will give us the advantages of correlation-ids and distributed tracing in that project too.
* | | | | | | | | | | | | Merge branch 'xanf/gitlab-ce-add-template-link' into 'master'Kushal Pandya2019-04-183-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add instructions on how to contribute a "Built-In" template on projects/new" Closes #55833 See merge request gitlab-org/gitlab-ce!26976
| * | | | | | | | | | | | | Add instructions on how to contribute a "Built-In" template on projects/new"Illya Klymov2019-04-183-1/+14
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'markdown-autocomplete-escaping' into 'master'Kushal Pandya2019-04-183-7/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only use backslash escapes in autocomplete when needed Closes #45348 See merge request gitlab-org/gitlab-ce!27457
| * | | | | | | | | | | | | Only use backslash escapes in autocomplete when neededmarkdown-autocomplete-escapingSean McGivern2019-04-173-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autocompletion for references happens on the frontend. Those references are turned into actual references on the backend, but only after Markdown processing has happened. That means that if a reference contains a character that Markdown might consume, it won't render correctly. So we need to do some escaping on the frontend. We have these potential problem characters: https://docs.gitlab.com/ee/user/markdown.html#emphasis 1. ~ - this is ~~strikethrough~~, but only when doubled. 2. _ - used for _emphasis_, doubled is __bold__. 3. * - also used for *emphasis*, doubled is **bold** also. 4. ` - used for `code spans`, any number works. We don't need to escape `-` any more. When it comes to being inside a word: 1. a~~b~~ has strikethrough, so it needs to be escaped everywhere. 2. a_b_ has no emphasis (see [a]) so it only needs to be escaped at the start and end of words. 3. a*b* has emphasis, so it needs to be escaped everywhere. 4. a`b` has a code span, so it needs to be escaped everywhere. Or, in code terms: 1. Always escape ~~, *, and ` when being inserted by autocomplete. 2. Escape _ when it's either at the beginning or the end of a word. [a]: https://docs.gitlab.com/ee/user/markdown.html#multiple-underscores-in-words
* | | | | | | | | | | | | | Merge branch 'jramsay/multiline-suggestion-docs' into 'master'Achilleas Pipinellis2019-04-181-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve multi-line suggestion docs See merge request gitlab-org/gitlab-ce!27465
| * | | | | | | | | | | | | | Improve multi-line suggestion docsJames Ramsay2019-04-171-6/+10
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sh-fix-related-merge-request-api-paths' into 'master'Fatih Acet2019-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix related merge requests not working with relative URL root See merge request gitlab-org/gitlab-ce!27475
| * | | | | | | | | | | | | | | Fix related merge requests not working with relative URL rootsh-fix-related-merge-request-api-pathsStan Hu2019-04-171-1/+1
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GitLab is configured with a relative URL root (e.g. /gitlab), an error appeared, "Something went wrong while fetching related merge requests." This change ensures the relative URL is included.
* | | | | | | | | | | | | | | Merge branch 'docs-serverless-yml-update' into 'master'Achilleas Pipinellis2019-04-181-15/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update serverless.yml for functions to include only node.js See merge request gitlab-org/gitlab-ce!27466
| * | | | | | | | | | | | | | | Update serverless.yml for functions to include only node.jsdocs-serverless-yml-updateDaniel Gruesso2019-04-171-15/+0
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '58293-extract-discussion-actions' into 'master'Filipa Lacerda2019-04-185-34/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract discussion actions into separate component Closes #58293 See merge request gitlab-org/gitlab-ce!27227
| * | | | | | | | | | | | | | | | Extract discussion actions into separate component58293-extract-discussion-actionsPaul Gascou-Vaillancourt2019-04-175-34/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Created DiscussionActions component - Updated NoteableDiscussion component accordingly - Wrote Jest tests for DiscussionActions - Updated Jest config to enable emojis aliases mock - Updated qa specs to reflect changes in NoteableDiscussions
* | | | | | | | | | | | | | | | | Merge branch '59830-dashboard-skeleton' into 'master'Phil Hughes2019-04-181-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes stylelint for dashboard_skeleton Closes #59830 See merge request gitlab-org/gitlab-ce!27422
| * | | | | | | | | | | | | | | | | Fixes stylelint for dashboard_skeleton59830-dashboard-skeletonFilipa Lacerda2019-04-161-8/+7
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'add-docs-ci-exceptions2' into 'master'Rémy Coutable2019-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update review.gitlab-ci.yml to fix review-stop See merge request gitlab-org/gitlab-ce!27478
| * | | | | | | | | | | | | | | | | | Update review.gitlab-ci.yml to fix review-stopMarcel Amirault2019-04-181-1/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'docs-fixes-for-rp-11-10' into 'master'Achilleas Pipinellis2019-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc fixes for the release post 11.10 See merge request gitlab-org/gitlab-ce!27450
| * | | | | | | | | | | | | | | | | | Doc fixes for the release post 11.10Marcia Ramos2019-04-181-1/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'rename_auto_deploy_app_links' into 'master'Marin Jankovski2019-04-182-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update links to new gitlab-org/charts/auto-deploy-app See merge request gitlab-org/gitlab-ce!27477
| * | | | | | | | | | | | | | | | | Update links to new gitlab-org/charts/auto-deploy-appDylan Griffith2019-04-182-4/+9
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'always-save-gitlab-ui-visual-artifacts' into 'master'Phil Hughes2019-04-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always save artifacts in the gitlab:ui:visual job See merge request gitlab-org/gitlab-ce!27469
| * | | | | | | | | | | | | | | | Always save artifacts in the gitlab:ui:visual jobalways-save-gitlab-ui-visual-artifactsRémy Coutable2019-04-171-0/+1
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | Merge branch 'retry-review-qa-smoke-job' into 'master'Lin Jen-Shin2019-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retry twice the review-qa-smoke job See merge request gitlab-org/gitlab-ce!27470
| * | | | | | | | | | | | | | | Retry twice the review-qa-smoke jobretry-review-qa-smoke-jobRémy Coutable2019-04-171-1/+1
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch 'jivl-add-feature-flag-gon-ee' into 'master'Fatih Acet2019-04-172-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make the monitoring bundle reusable See merge request gitlab-org/gitlab-ce!27402
| * | | | | | | | | | | | | | | Make the monitoring bundle reusablejivl-add-feature-flag-gon-eeJose Vargas2019-04-162-1/+5
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also push the frontend flag in the clusters controller
* | | | | | | | | | | | | | | Merge branch ↵Kamil Trzciński2019-04-1710-62/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60500-disable-jit-kubernetes-resource-creation-for-project-level-clusters' into 'master' Disable JIT Kubernetes resource creation for project level clusters Closes #60500 See merge request gitlab-org/gitlab-ce!27352
| * | | | | | | | | | | | | | | Disable JIT resource creation for project clusters60500-disable-jit-kubernetes-resource-creation-for-project-level-clustersTiger2019-04-1610-62/+83
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JIT resource creation blocks deployments if a user is self-managing their cluster, as it will fail the build if unable to create a namespace and service account. Using a custom namespace and service account was previously supported for project level clusters, so we should preserve this functionality. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27352
* | | | | | | | | | | | | | | Merge branch 'knative-0.5' into 'master'Douglas Barbosa Alexandre2019-04-176-4/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump version of knative from 0.3 -> 0.5 See merge request gitlab-org/gitlab-ce!27101
| * | | | | | | | | | | | | | | Bump version of knative from 0.3 -> 0.5Chris Baumbauer2019-04-176-4/+29
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'increase-retries' into 'master'Kamil Trzciński2019-04-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retry twice the system, API and unknown failures See merge request gitlab-org/gitlab-ce!27467