summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Simplify users API QA specqa/rs-api-users-specRobert Speicher2018-05-251-5/+4
|
* Merge branch '45404-remove-gemnasium-badge-from-project-s-readme-md' into ↵test-branch-from-release-toolsRémy Coutable2018-05-252-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.mdTakuya Noguchi2018-05-252-1/+5
| |
* | Merge branch 'docs/remove-dead-link' into 'master'Achilleas Pipinellis2018-05-251-1/+0
|\ \ | | | | | | | | | | | | Remove dead link to Google Drive See merge request gitlab-org/gitlab-ce!19139
| * | Remove dead link to Google Drivedocs/remove-dead-linkBrendan O'Leary 🐢2018-05-251-1/+0
| | |
* | | Merge branch 'rs-projects-destroy-service-parity' into 'master'Rémy Coutable2018-05-251-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-parityRobert Speicher2018-05-231-3/+16
| | | |
* | | | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'Rémy Coutable2018-05-2516-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-repoRémy Coutable2018-05-2416-14/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'add-embedded-snippets-docs' into 'master'Achilleas Pipinellis2018-05-251-0/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Init documentation for embedded snippets See merge request gitlab-org/gitlab-ce!19120
| * | | | | Init documentation for embedded snippetsAndreas Kämmerle2018-05-251-0/+33
|/ / / / /
* | | | | Merge branch '46768-typo-on-the-empty-pipelines-page' into 'master'Filipa Lacerda2018-05-252-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 viewMark Fletcher2018-05-252-2/+2
| |/ / / /
* | | | | Merge branch '44579-ide-add-pipeline-to-status-bar' into 'master'Phil Hughes2018-05-2514-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ís2018-05-2514-48/+386
|/ / / /
* | | | Merge branch 'sh-disable-background-metrics-in-tests' into 'master'Robert Speicher2018-05-241-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-testsStan Hu2018-05-241-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 Maan2018-05-243-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-gitalyAhmad Hassan2018-05-241-8/+0
| | | | | |
| * | | | | Take restoring custom hooks and the skip flag out of scopeAhmad Hassan2018-05-231-4/+2
| | | | | |
| * | | | | Remove gitaly_migrate blocks and replace by early returnAhmad Hassan2018-05-211-33/+26
| | | | | |
| * | | | | Move restore_custom_hooks to its seperate functionAhmad Hassan2018-05-181-16/+20
| | | | | |
| * | | | | Return from prepare directory if gitaly skip is enabledAhmad Hassan2018-05-171-0/+2
| | | | | |
| * | | | | Call path_to_repo only when using gitalyAhmad Hassan2018-05-171-1/+1
| | | | | |
| * | | | | Changelog entryAhmad Hassan2018-05-161-0/+5
| | | | | |
| * | | | | Fix failing specsAhmad Hassan2018-05-161-26/+3
| | | | | |
| * | | | | Link to upstream gitaly issues for the missing restore pathsDJ Mountney2018-05-161-6/+8
| | | | | |
| * | | | | Fix the paths for wiki restoreDJ Mountney2018-05-151-7/+8
| | | | | |
| * | | | | Output project name before restoring each project repoDJ Mountney2018-05-151-0/+1
| | | | | |
| * | | | | Remove hooks restore that is no longer necessaryDJ Mountney2018-05-151-7/+0
| | | | | |
| * | | | | Add back some of the non-gitaly restore functionality behind gatesDJ Mountney2018-05-151-20/+66
| | | | | |
| * | | | | Wrap create_from_bundle in a begin rescue blockAhmad Hassan2018-05-151-5/+19
| | | | | |
| * | | | | Better repo restore progress loggingAhmad Hassan2018-05-151-1/+5
| | | | | |
| * | | | | Remove useless print lineAhmad Hassan2018-05-151-1/+0
| | | | | |
| * | | | | Use gitaly repository_service.CreateFromBundle to restoreAhmad Hassan2018-05-151-53/+2
| | | | | |
* | | | | | Merge branch 'dz-refactor-cluster-apps-schedule' into 'master'Douwe Maan2018-05-243-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-scheduleDmitriy Zaporozhets2018-05-243-35/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'commit-branch-tag-icon-update' into 'master'Phil Hughes2018-05-245-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 detailsConstance Okoghenun2018-05-245-7/+13
|/ / / / / / /
* | | | | | | Merge branch 'ce-6127-move-merge-requests-services' into 'master'Rémy Coutable2018-05-242-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-servicesLin Jen-Shin2018-05-241-2/+6
| | | | | | | |
| * | | | | | | Avoid using expect_any_instance_ofLin Jen-Shin2018-05-231-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 Coutable2018-05-245-18/+84
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sidebar issue count Closes #38418 See merge request gitlab-org/gitlab-ce!19022
| * | | | | | | | Fix sidebar issue countissue_38418Felipe Artur2018-05-245-18/+84
| | | | | | | | |
* | | | | | | | | Merge branch '5779_rename_code_quality_job_and_artifact' into 'master'Achilleas Pipinellis2018-05-245-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_artifactOlivier Gonzalez2018-05-231-0/+7
| | | | | | | | | |
| * | | | | | | | | Do not update project's .gitlab-ci.yml right nowOlivier Gonzalez2018-05-231-2/+2
| | | | | | | | | |
| * | | | | | | | | Rename code quality job and artifact. Refs gitlab-org/gitlab-ee#5779Olivier Gonzalez2018-05-236-17/+17
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs-backport-ee-5794-to-ce' into 'master'Achilleas Pipinellis2018-05-241-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-ceMarcia Ramos2018-05-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated documentation as per latest missing features on about.gitlab.com See merge request gitlab-org/gitlab-ee!5794