summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add better explanation for CI_PIPELINE_SOURCEbetter-explain-pipeline-sourceFabio Busatto2018-03-301-1/+1
|
* Merge branch 'rc/checkout-false-in-package-and-qa' into 'master'Grzegorz Bizon2018-03-301-1/+10
|\ | | | | | | | | Don't let the Runner clone/fetch prior to the package-and-qa job See merge request gitlab-org/gitlab-ce!18102
| * Don't let the Runner clone/fetch prior to the package-and-qa jobrc/checkout-false-in-package-and-qaRémy Coutable2018-03-301-1/+10
| | | | | | | | | | | | | | Do it by hand instead, that way we can still run this job even if the branch has been removed. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '44774-migrate-upload-task-fails-for-upload-with-store-nil' ↵Sean McGivern2018-03-303-5/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Migrate upload task fails for Upload with `store: nil`" Closes #44774 See merge request gitlab-org/gitlab-ce!18082
| * | apply feedbackMicaël Bergeron2018-03-302-2/+4
| | |
| * | add changelog44774-migrate-upload-task-fails-for-upload-with-store-nilMicaël Bergeron2018-03-291-0/+5
| | |
| * | fix a future conflictMicaël Bergeron2018-03-291-1/+2
| | |
| * | fix rake migration task from ignoring Upload(store: nil)Micaël Bergeron2018-03-292-5/+16
| | |
* | | Merge branch '44835-doc-api-jobs-md-should-be-harmonized-between-ce-and-ee' ↵Sean McGivern2018-03-301-5/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "doc/api/jobs.md should be harmonized between CE and EE" Closes #44835 See merge request gitlab-org/gitlab-ce!18106
| * | | Backport part of the doc/api/jobs.md file from EERémy Coutable2018-03-301-5/+9
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'runner-update-doc' into 'master'Achilleas Pipinellis2018-03-301-6/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Updating runner docs to add specific runner to projects from the admin area-doc See merge request gitlab-org/gitlab-ce!17585
| * | | Updating runner docs to add specific runner to projects from the admin area-docAric Buerer2018-03-301-6/+13
|/ / /
* | | Merge branch '42593-restore-rake-task' into 'master'Douwe Maan2018-03-3011-34/+128
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Tweak restore rake task to provide an option to set alternate temporary backup directory Closes #42593 See merge request gitlab-org/gitlab-ce!17516
| * | | Add more testsBalasankar "Balu" C2018-03-301-3/+26
| | | |
| * | | Make rubocop happyBalasankar "Balu" C2018-03-301-2/+1
| | | |
| * | | Add basic testsBalasankar "Balu" C2018-03-302-0/+55
| | | |
| * | | Move existing dirs to a temp location while restoreBalasankar "Balu" C2018-03-3010-34/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of renaming existing storage directories to a timestamped format, create a timestamped directory in a temporary location and move the individual files and folders inside storage directories to it. This helps us with nested storage directories.
* | | | Merge branch 'fix/projects-no-repository-placeholder' into 'master'Rémy Coutable2018-03-308-23/+129
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Update no repository placeholder See merge request gitlab-org/gitlab-ce!17964
| * | | Use translated string for breadcrumb titleGeorge Tsiolis2018-03-294-4/+4
| | | |
| * | | Update translated stringsGeorge Tsiolis2018-03-273-17/+116
| | | |
| * | | Update no repository placeholderGeorge Tsiolis2018-03-263-3/+10
| | | |
* | | | Merge branch 'ac/pages-port' into 'master'Nick Thomas2018-03-305-14/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gitlab-pages port number to artifacts links, if needed Closes #44398 See merge request gitlab-org/gitlab-ce!18073
| * | | | Add port number to artifacts links to gitlab-pages, if neededAlessio Caiazza2018-03-295-14/+58
| | | | |
* | | | | Merge branch 'zj-update-charlock_holmes' into 'master'Douwe Maan2018-03-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update charlock_holmes to 0.76 See merge request gitlab-org/gitlab-ce!18103
| * | | | | Update charlock_holmes to 0.76Zeger-Jan van de Weg2018-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Didn't compile against newer icu4c versions and was fixed upstream in https://github.com/brianmario/charlock_holmes/pull/129, which was releaed in the versions its now locked to.
* | | | | | Merge branch 'add-milestone-path-to-dashboard-milestones-breadcrumb-link' ↵Rémy Coutable2018-03-302-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update dashboard milestones breadcrumb link See merge request gitlab-org/gitlab-ce!17933
| * | | | | | Update dashboard milestones breadcrumb linkGeorge Tsiolis2018-03-222-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add milestone path to `/dashboard/milestones` breadcrumb link (which was causing 404 error) - Add milestone name to `/dashboard/milestones` breadcrumb - Add whitespace after the milestone name
* | | | | | | Merge branch 'winh-repository-limit-lfs-docs' into 'master'Achilleas Pipinellis2018-03-302-3/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that LFS is included in the 10GB repository limit on gitlab.com See merge request gitlab-org/gitlab-ce!18093
| * | | | | | | Document that LFS is included in the 10GB repository limit on gitlab.comWinnie Hellmann (back on Tuesday)2018-03-302-3/+12
|/ / / / / / /
* | | | | | | Merge branch 'git-env-repo' into 'master'Sean McGivern2018-03-3010-157/+70
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove support for absolute dirs from Git::Env See merge request gitlab-org/gitlab-ce!18024
| * | | | | | | Remove support for absolute dirs from Git::EnvJacob Vosmaer (GitLab)2018-03-3010-157/+70
|/ / / / / / /
* | | | | | | Merge branch 'osw-order-boards-by-name' into 'master'Sean McGivern2018-03-301-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Backport] Order boards dropdown alphabetically See merge request gitlab-org/gitlab-ce!18065
| * | | | | | | [Backport] Order boards alphabeticallyosw-order-boards-by-nameoswaldoferreira2018-03-281-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'fix-ee_compat_check-for-forks' into 'master'Rémy Coutable2018-03-301-57/+91
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ee_compat_check for forks Closes #40788 See merge request gitlab-org/gitlab-ce!17532
| * | | | | | | | Improve the ee_compat_check_job to handle gitlab-ee forksRémy Coutable2018-03-291-57/+91
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'revert-7c626d2d' into 'master'Mike Greiling2018-03-302-4/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'sh-add-fsevents-dev-dependency' into 'master'" See merge request gitlab-org/gitlab-ce!18096
| * | | | | | | Revert "Merge branch 'sh-add-fsevents-dev-dependency' into 'master'"Stan Hu2018-03-302-4/+1
|/ / / / / / / | | | | | | | | | | | | | | This reverts merge request !17971
* | | | | | | Merge branch 'docs-fix-per-runner-timeout-section' into 'master'44805-rename-custom-metric-section-headersAchilleas Pipinellis2018-03-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix documentation introduced in gitlab-org/gitlab-ce!17221 See merge request gitlab-org/gitlab-ce!18087
| * | | | | | | Fix documentation introduced in gitlab-org/gitlab-ce!17221Tomasz Maczukin2018-03-291-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'brancho/gitlab-ce-Link_to_project_labels_page' into 'master'Sean McGivern2018-03-292-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always display Labels section in issuable sidebar, even when the project has no labels Closes #23472 See merge request gitlab-org/gitlab-ce!18081
| * | | | | | | | Always display Labels section in issuable sidebar, even when the project has ↵brancho/gitlab-ce-Link_to_project_labels_pageBranka Martinovic2018-03-292-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no labels Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'vuex-action-helper-correctly-fail' into 'master'Tim Zallmann2018-03-293-112/+246
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly fail Vuex action helper Closes #44735 See merge request gitlab-org/gitlab-ce!18072
| * | | | | | | | | Add dispatch mock to the test helpervuex-action-helper-correctly-failFilipa Lacerda2018-03-293-12/+62
| | | | | | | | | |
| * | | | | | | | | fixed failinng tests after helper changePhil Hughes2018-03-293-101/+185
| | | | | | | | | |
| * | | | | | | | | Use `toEqual` for the matchersFilipa Lacerda2018-03-291-3/+3
| | | | | | | | | |
| * | | | | | | | | Correctly fail Vuex action helperPhil Hughes2018-03-291-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'update-todos-docs' into 'master'Sean McGivern2018-03-291-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update todos docs to say will trigger when commenting on a commit See merge request gitlab-org/gitlab-ce!18083
| * | | | | | | | | | Update todos to say will trigger when commenting on a commitVictor Wu2018-03-291-2/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'docs/google-kubernetes-engine' into 'master'Marcia Ramos2018-03-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Container to Kubernetes in Google integration docs Closes #44685 See merge request gitlab-org/gitlab-ce!18010
| * | | | | | | | | | Change Container to Kubernetes in Google integration docsdocs/google-kubernetes-engineAchilleas Pipinellis2018-03-271-1/+1
| | | | | | | | | | |