Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify users API QA specqa/rs-api-users-spec | Robert Speicher | 2018-05-25 | 1 | -5/+4 |
| | |||||
* | Merge branch '45404-remove-gemnasium-badge-from-project-s-readme-md' into ↵test-branch-from-release-tools | Rémy Coutable | 2018-05-25 | 2 | -1/+5 |
|\ | | | | | | | | | | | | | | | | | 'master' Remove Gemnasium badge from project's README.md Closes #45404 See merge request gitlab-org/gitlab-ce!19136 | ||||
| * | Remove Gemnasium badge from project README.md | Takuya Noguchi | 2018-05-25 | 2 | -1/+5 |
| | | |||||
* | | Merge branch 'docs/remove-dead-link' into 'master' | Achilleas Pipinellis | 2018-05-25 | 1 | -1/+0 |
|\ \ | | | | | | | | | | | | | Remove dead link to Google Drive See merge request gitlab-org/gitlab-ce!19139 | ||||
| * | | Remove dead link to Google Drivedocs/remove-dead-link | Brendan O'Leary 🐢 | 2018-05-25 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'rs-projects-destroy-service-parity' into 'master' | Rémy Coutable | 2018-05-25 | 1 | -3/+16 |
|\ \ \ | | | | | | | | | | | | | | | | | Bring CE-EE parity to app/services/projects/destroy_service.rb See merge request gitlab-org/gitlab-ce!19111 | ||||
| * | | | Bring CE-EE parity to app/services/projects/destroy_service.rbrs-projects-destroy-service-parity | Robert Speicher | 2018-05-23 | 1 | -3/+16 |
| | | | | |||||
* | | | | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master' | Rémy Coutable | 2018-05-25 | 16 | -14/+95 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "gitlab 10.8 assumes that installation is a git working copy." Closes #46600 See merge request gitlab-org/gitlab-ce!19125 | ||||
| * | | | | Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repo | Rémy Coutable | 2018-05-24 | 16 | -14/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Merge branch 'add-embedded-snippets-docs' into 'master' | Achilleas Pipinellis | 2018-05-25 | 1 | -0/+33 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Init documentation for embedded snippets See merge request gitlab-org/gitlab-ce!19120 | ||||
| * | | | | | Init documentation for embedded snippets | Andreas Kämmerle | 2018-05-25 | 1 | -0/+33 |
|/ / / / / | |||||
* | | | | | Merge branch '46768-typo-on-the-empty-pipelines-page' into 'master' | Filipa Lacerda | 2018-05-25 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Typo on the empty Pipelines page" Closes #46768 See merge request gitlab-org/gitlab-ce!19140 | ||||
| * | | | | | Fix typo in Pipelines empty state view | Mark Fletcher | 2018-05-25 | 2 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch '44579-ide-add-pipeline-to-status-bar' into 'master' | Phil Hughes | 2018-05-25 | 14 | -48/+386 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Show CI pipeline status in Web IDE" Closes #44579 See merge request gitlab-org/gitlab-ce!19048 | ||||
| * | | | | Resolve "Show CI pipeline status in Web IDE" | André Luís | 2018-05-25 | 14 | -48/+386 |
|/ / / / | |||||
* | | | | Merge branch 'sh-disable-background-metrics-in-tests' into 'master' | Robert Speicher | 2018-05-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Disable the background Prometheus sampler in tests See merge request gitlab-org/gitlab-ce!19130 | ||||
| * | | | | Disable the background Prometheus sampler in testssh-disable-background-metrics-in-tests | Stan Hu | 2018-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This sampler can interfere with tests and cause transient build failures, such as https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/70241683. | ||||
* | | | | | Merge branch 'migrate-restore-repo-to-gitaly' into 'master' | Douwe Maan | 2018-05-24 | 3 | -71/+51 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitaly repository_service.CreateRepositoryFromBundle to restore (rake task) Closes charts/gitlab#390 See merge request gitlab-org/gitlab-ce!18644 | ||||
| * | | | | | Remove unneeded gitaly_migrate functionmigrate-restore-repo-to-gitaly | Ahmad Hassan | 2018-05-24 | 1 | -8/+0 |
| | | | | | | |||||
| * | | | | | Take restoring custom hooks and the skip flag out of scope | Ahmad Hassan | 2018-05-23 | 1 | -4/+2 |
| | | | | | | |||||
| * | | | | | Remove gitaly_migrate blocks and replace by early return | Ahmad Hassan | 2018-05-21 | 1 | -33/+26 |
| | | | | | | |||||
| * | | | | | Move restore_custom_hooks to its seperate function | Ahmad Hassan | 2018-05-18 | 1 | -16/+20 |
| | | | | | | |||||
| * | | | | | Return from prepare directory if gitaly skip is enabled | Ahmad Hassan | 2018-05-17 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Call path_to_repo only when using gitaly | Ahmad Hassan | 2018-05-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Changelog entry | Ahmad Hassan | 2018-05-16 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Fix failing specs | Ahmad Hassan | 2018-05-16 | 1 | -26/+3 |
| | | | | | | |||||
| * | | | | | Link to upstream gitaly issues for the missing restore paths | DJ Mountney | 2018-05-16 | 1 | -6/+8 |
| | | | | | | |||||
| * | | | | | Fix the paths for wiki restore | DJ Mountney | 2018-05-15 | 1 | -7/+8 |
| | | | | | | |||||
| * | | | | | Output project name before restoring each project repo | DJ Mountney | 2018-05-15 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Remove hooks restore that is no longer necessary | DJ Mountney | 2018-05-15 | 1 | -7/+0 |
| | | | | | | |||||
| * | | | | | Add back some of the non-gitaly restore functionality behind gates | DJ Mountney | 2018-05-15 | 1 | -20/+66 |
| | | | | | | |||||
| * | | | | | Wrap create_from_bundle in a begin rescue block | Ahmad Hassan | 2018-05-15 | 1 | -5/+19 |
| | | | | | | |||||
| * | | | | | Better repo restore progress logging | Ahmad Hassan | 2018-05-15 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | Remove useless print line | Ahmad Hassan | 2018-05-15 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Use gitaly repository_service.CreateFromBundle to restore | Ahmad Hassan | 2018-05-15 | 1 | -53/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'dz-refactor-cluster-apps-schedule' into 'master' | Douwe Maan | 2018-05-24 | 3 | -35/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor code around scheduling cluster installations See merge request gitlab-org/gitlab-ce!19108 | ||||
| * | | | | | | Refactor code around scheduling cluster installationsdz-refactor-cluster-apps-schedule | Dmitriy Zaporozhets | 2018-05-24 | 3 | -35/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | Merge branch 'commit-branch-tag-icon-update' into 'master' | Phil Hughes | 2018-05-24 | 5 | -7/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated branches and tag icons in commit details See merge request gitlab-org/gitlab-ce!18953 | ||||
| * | | | | | | | Updated branches and tag icons in commit details | Constance Okoghenun | 2018-05-24 | 5 | -7/+13 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'ce-6127-move-merge-requests-services' into 'master' | Rémy Coutable | 2018-05-24 | 2 | -4/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Extract EE specific files/lines for some merge requests files See merge request gitlab-org/gitlab-ce!19107 | ||||
| * | | | | | | | Extract a do_execute method to be overriddence-6127-move-merge-requests-services | Lin Jen-Shin | 2018-05-24 | 1 | -2/+6 |
| | | | | | | | | |||||
| * | | | | | | | Avoid using expect_any_instance_of | Lin Jen-Shin | 2018-05-23 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't use it for prepended module, so use `and_wrap_original` to wrap around the instance. | ||||
* | | | | | | | | Merge branch 'issue_38418' into 'master' | Rémy Coutable | 2018-05-24 | 5 | -18/+84 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sidebar issue count Closes #38418 See merge request gitlab-org/gitlab-ce!19022 | ||||
| * | | | | | | | | Fix sidebar issue countissue_38418 | Felipe Artur | 2018-05-24 | 5 | -18/+84 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '5779_rename_code_quality_job_and_artifact' into 'master' | Achilleas Pipinellis | 2018-05-24 | 5 | -15/+22 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename code quality job and artifact. See merge request gitlab-org/gitlab-ce!19049 | ||||
| * | | | | | | | | | Add deprecation notice in documentation5779_rename_code_quality_job_and_artifact | Olivier Gonzalez | 2018-05-23 | 1 | -0/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Do not update project's .gitlab-ci.yml right now | Olivier Gonzalez | 2018-05-23 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Rename code quality job and artifact. Refs gitlab-org/gitlab-ee#5779 | Olivier Gonzalez | 2018-05-23 | 6 | -17/+17 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'docs-backport-ee-5794-to-ce' into 'master' | Achilleas Pipinellis | 2018-05-24 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Updated documentation as per latest missing features on about.gitlab.com See merge request gitlab-org/gitlab-ce!19134 | ||||
| * | | | | | | | | | Merge branch 'patch-7' into 'master'docs-backport-ee-5794-to-ce | Marcia Ramos | 2018-05-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated documentation as per latest missing features on about.gitlab.com See merge request gitlab-org/gitlab-ee!5794 |