Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Moves script_failure conditional over lambda46552-fixes-redundant-message-for-failure-reasons | Mayra Cabrera | 2018-05-30 | 1 | -2/+2 |
| | | | | So the 'failed' message can actually indicate if the build failed or not | ||||
* | Removes redundant error message for script failures | Mayra Cabrera | 2018-05-24 | 5 | -13/+26 |
| | | | | | | | Script failure message was redundant so it was removed. Also 'check your job log' message was removed from all the error messages. Closes #44271 | ||||
* | 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 | ||||
* | | | | | | | Merge branch 'sh-fix-backup-specific-rake-task' into 'master' | Rémy Coutable | 2018-05-24 | 14 | -114/+163 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix backup creation and restore for specific Rake tasks Closes #40617 See merge request gitlab-org/gitlab-ce!19122 | ||||
| * | | | | | | Fix backup creation and restore for specific Rake tasks | Stan Hu | 2018-05-24 | 14 | -114/+163 |
|/ / / / / / | |||||
* | | | | | | Merge branch ↵ | Achilleas Pipinellis | 2018-05-24 | 2 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46723-api-created-issue-do-not-get-assigned-to-specified-milestone-docs' into 'master' Resolve "API created issue do not get assigned to specified milestone" Closes #46723 See merge request gitlab-org/gitlab-ce!19127 | ||||
| * | | | | | | Clarify milestone_id scope for API operations on Issuables | Mark Fletcher | 2018-05-24 | 2 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge branch '5778_rename_container_scanning_job_and_artifact' into 'master' | Achilleas Pipinellis | 2018-05-24 | 2 | -12/+19 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename container scanning job and artifact See merge request gitlab-org/gitlab-ce!19045 | ||||
| * | | | | | | | Rename container scanning job and artifact | Olivier Gonzalez | 2018-05-24 | 2 | -12/+19 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'docs-update-backup-restore-guide' into 'master' | Achilleas Pipinellis | 2018-05-24 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add info about the current format of the backup name and refresh examples of commands See merge request gitlab-org/gitlab-ce!18739 | ||||
| * | | | | | | | add info about the current format of the backup name and refresh examples of ↵ | Alexander Tanayno | 2018-05-24 | 1 | -6/+6 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | commands | ||||
* | | | | | | | Merge branch '46741-add-access-control-allow-headers-wds' into 'master' | Mike Greiling | 2018-05-24 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Access-Control-Allow-Headers` to Webpack Dev Server config Closes #46741 See merge request gitlab-org/gitlab-ce!19131 | ||||
| * | | | | | | | Add `Access-Control-Allow-Headers` to Webpack Dev Server config | Kushal Pandya | 2018-05-24 | 1 | -1/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'ce-jej/saml-failure-messages' into 'master' | Grzegorz Bizon | 2018-05-24 | 3 | -2/+17 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Backport helpers from GroupSAML failure messages See merge request gitlab-org/gitlab-ce!19064 | ||||
| * | | | | | | | | Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messages | James Edwards-Jones | 2018-05-21 | 3 | -2/+17 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'fl-loading-icon' into 'master' | Phil Hughes | 2018-05-24 | 3 | -4/+22 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show loading icon only when making the request See merge request gitlab-org/gitlab-ce!19116 | ||||
| * | | | | | | | | | Show loading icon only when making the requestfl-loading-icon | Filipa Lacerda | 2018-05-23 | 3 | -4/+22 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mr-conflict-notification' into 'master' | Douwe Maan | 2018-05-24 | 24 | -85/+373 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042 |