summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use convertPermissionToBoolean to get a booleanmr-file-listPhil Hughes2018-10-232-2/+7
|
* Changed list view tooltipPhil Hughes2018-10-232-5/+5
|
* Updated file tree iconPhil Hughes2018-10-234-5/+10
|
* Store tree list preference in localStoragePhil Hughes2018-10-232-13/+24
| | | | Fixed clear search button not clearing
* Fixed failing specsPhil Hughes2018-10-233-12/+40
| | | | Added tests to file row truncated text computed prop
* Dynamically truncate the text in the file rowPhil Hughes2018-10-233-15/+27
|
* Add list mode to file browser in diffsPhil Hughes2018-10-238-24/+221
| | | | | | | | | | | This adds toggle buttons to switch between file & tree list. For file list, it renders the truncated paths with the ellipsis at the start of the path. When focusing the input, it hides the toggle buttons. On blur, the buttons get shown again. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51859
* Merge branch 'qa-run-karma' into 'master'Phil Hughes2018-10-231-1/+1
|\ | | | | | | | | Run karma for qa-* branches See merge request gitlab-org/gitlab-ce!22464
| * Run karma for qa-* branchesqa-run-karmaRémy Coutable2018-10-221-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '42611-removed-branch-link' into 'master'Grzegorz Bizon2018-10-235-3/+71
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Removed branch link in pipelines page is broken" Closes #42611 See merge request gitlab-org/gitlab-ce!21451
| * | Do not raise error when checking pipeline reference42611-removed-branch-linkGrzegorz Bizon2018-10-223-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | Return from the `Ci::Pipeline#ref_exists?` in case when there is no repository present. This also fixes pipeline page feature specs by changing pipeline reference instead of stubbing `ref_exist?` method.
| * | Fix pipeline reference existence check and add specsGrzegorz Bizon2018-10-222-3/+26
| | |
| * | Removes extra empty linesFilipa Lacerda2018-10-171-2/+0
| | |
| * | Creates ref_exists? method for Pipeline classFilipa Lacerda2018-10-083-2/+6
| | |
| * | Merge branch 'master' into 42611-removed-branch-linkFilipa Lacerda2018-10-083510-36258/+183588
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1252 commits) Render log artifact files in GitLab Check disabled_services when finding a service Fix invalid parent path on group settings page Backport CE changes for: [Frontend only] Batch comments on merge requests Add button to insert table in markdown editor Update GITALY_SERVER_VERSION Updates Laravel.gitlab-ci.yml template Update operations metrics empty state Fix LFS uploaded images not being rendered Prepare admin/projects/show view to allow EE specific feature Add timed incremental rollout to Auto DevOps Update spec comment to point to correct issue Fix documentation for variables Document Security and Licence Management features permissions Fix time dependent jobs spec Use a CTE to remove the query timeout Backport changes from gitlab-ee!7538 Fix CE to EE merge (backport) Add changelog entry Refactor Feature.flipper method ...
| * | | Render link to branch only when branch still existsFilipa Lacerda2018-08-313-1/+27
| | | |
* | | | Merge branch '52840-fix-runners-details-page' into 'master'Grzegorz Bizon2018-10-234-1/+171
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Group runner confused about whether or not is protected" Closes #52840 See merge request gitlab-org/gitlab-ce!22459
| * | | | Add CHANGELOG entry52840-fix-runners-details-pageTomasz Maczukin2018-10-221-0/+5
| | | | |
| * | | | Fix rendering of 'Protected' valueTomasz Maczukin2018-10-221-1/+1
| | | | |
| * | | | Add tests for shared/runners/show.html.haml viewTomasz Maczukin2018-10-222-0/+165
| | | | |
* | | | | Merge branch 'sh-pages-eof-error' into 'master'Grzegorz Bizon2018-10-234-2/+88
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix EOF detection with CI artifacts metadata Closes #36954 See merge request gitlab-org/gitlab-ce!22479
| * | | | | Add a spec that generates the metadata dynamicallysh-pages-eof-errorStan Hu2018-10-192-0/+78
| | | | | |
| * | | | | Fix EOF detection with CI artifacts metadataStan Hu2018-10-182-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some corner cases where a perfectly correct GZIP stream may not hit the EOF until another read is attempted. We now skip the entry if we don't see any valid data, which allows the EOF check to work properly. Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22479
* | | | | | Merge branch 'patch-31' into 'master'Evan Read2018-10-231-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about the uid_attribute custom setting in the SAML docs See merge request gitlab-org/gitlab-ce!22500
| * | | | | | Edited uid_attribute information with suggested changesBlair Lunceford2018-10-221-3/+2
| | | | | | |
| * | | | | | Add information about the uid_attribute custom setting in the SAML docsBlair Lunceford2018-10-191-0/+18
| | | | | | |
* | | | | | | Merge branch 'add-new-kubernetes-spec-helpers' into 'master'Dmitriy Zaporozhets2018-10-232-3/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new Kubernetes spec helpers See merge request gitlab-org/gitlab-ce!22525
| * | | | | | | Introduce new kubernetes spec helpersadd-new-kubernetes-spec-helpersMayra Cabrera2018-10-222-3/+25
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add create_role_binding, create_namespace and get_namespace kubernetes spec helpers. This new helpers are going to be used on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011
* | | | | | | Merge branch 'revert-eac645d7' into 'master'Robert Speicher2018-10-222-87/+75
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'" See merge request gitlab-org/gitlab-ce!22523
| * | | | | | | Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'"Thong Kuah2018-10-222-87/+75
| | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !22407
* | | | | | | | Merge branch '46884-remove-card-title' into 'master'Annabel Dunstone Gray2018-10-2214-66/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove card-title in card-header Closes #46884 See merge request gitlab-org/gitlab-ce!19335
| * | | | | | | Remove .card-title from .card-header for BS4 migrationTakuya Noguchi2018-10-1914-66/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces .card-header > hX.card-title with hX.card-header to remove .card-title. At a occurrence where bold styling is not necessary, div.card-header is used instead. By full removal of .card-title at the moment, all workarounds for BS4's card-title are removed as well. More information: https://getbootstrap.com/docs/4.0/migration/#panels Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | Merge branch 'feature/gb/improve-include-config-errors-reporting' into 'master'Douwe Maan2018-10-2218-204/+384
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve validation errors for external CI/CD configuration Closes #51369 See merge request gitlab-org/gitlab-ce!22394
| * | | | | | | | Improve specs for abstract remote `include` filefeature/gb/improve-include-config-errors-reportingGrzegorz Bizon2018-10-221-4/+4
| | | | | | | | |
| * | | | | | | | Improve error message when `include` is blockedGrzegorz Bizon2018-10-222-5/+12
| | | | | | | | |
| * | | | | | | | Improve remote CI/CD config file extension validationGrzegorz Bizon2018-10-192-2/+54
| | | | | | | | |
| * | | | | | | | Extend error message in case of HTTP errors in `include`Grzegorz Bizon2018-10-194-23/+65
| | | | | | | | |
| * | | | | | | | Add changelog for `include` error reporting improvementsGrzegorz Bizon2018-10-181-0/+5
| | | | | | | | |
| * | | | | | | | Refactor `include` code and improve error reportingGrzegorz Bizon2018-10-188-43/+103
| | | | | | | | |
| * | | | | | | | Extract method that fetchesremote CI/CD included configGrzegorz Bizon2018-10-183-13/+12
| | | | | | | | |
| * | | | | | | | Add IncludeError exception and use it in CI configGrzegorz Bizon2018-10-183-5/+6
| | | | | | | | |
| * | | | | | | | Move external CI config class into proper namespaceGrzegorz Bizon2018-10-1611-113/+127
| | | | | | | | |
| * | | | | | | | Move external CI config files into Ci class contextGrzegorz Bizon2018-10-169-0/+0
| | | | | | | | |
* | | | | | | | | Merge branch '51716-add-kubernetes-namespace-model' into 'master'Andreas Brandl2018-10-2214-24/+287
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Clusters::KubernetesNamespace model See merge request gitlab-org/gitlab-ce!22404
| * | | | | | | | | Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-modelMayra Cabrera2018-10-2214-24/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This model will be used to persist into database Kubernetes properties, such as namespace, service account name and service account token.
* | | | | | | | | | Merge branch 'blackst0ne-bump-mermaid' into 'master'Mike Greiling2018-10-224-40/+122
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump mermaid to 8.0.0-rc.8 Closes #52601, #50105, and #40470 See merge request gitlab-org/gitlab-ce!22509
| * | | | | | | | | | Bump mermaid to 8.0.0-rc.8blackst0ne-bump-mermaidblackst0ne2018-10-224-40/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves `mermaid` from blackst0ne-mermaid package to the upstream version. The reason why the fork was used was this bug[1]. The bug has been fixed, so there's no need to maintain my fork anymore. [1]: https://github.com/knsv/mermaid/issues/584
* | | | | | | | | | | Merge branch 'change-branch-font-type-in-tag-creation' into 'master'Annabel Dunstone Gray2018-10-223-2/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change branch font type in tag creation See merge request gitlab-org/gitlab-ce!22454
| * | | | | | | | | | | Change branch font type in tag creationGeorge Tsiolis2018-10-223-2/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'refactor-project-rename-repo' into 'master'Robert Speicher2018-10-229-247/+368
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Project#rename_repo to a service class See merge request gitlab-org/gitlab-ce!22419
View Lorry Controller Status