summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Envoy.blade.php syntax fixedpdeden/gitlab-ee-patch-7Patrick Deden2018-03-301-1/+1
|
* Merge branch 'fj-42685-extend-project-export-endpoint' into 'master'Douwe Maan2018-03-3019-25/+671
|\ | | | | | | | | | | | | Extend API for exporting a project with direct upload URL Closes #42685 See merge request gitlab-org/gitlab-ce!17686
| * Extend API for exporting a project with direct upload URLFrancisco Javier López2018-03-3019-25/+671
|/
* Merge branch '41967_issue_api_closed_by_info' into 'master'Sean McGivern2018-03-3011-1/+90
|\ | | | | | | | | Add closed by information to issue API See merge request gitlab-org/gitlab-ce!17042
| * added missing space in docs and a changeloghaseeb2018-03-062-2/+7
| |
| * changed the way of nullifying columshaseeb2018-03-052-1/+5
| |
| * note addedhaseeb2018-03-031-0/+21
| |
| * nullify closed by on reopenning issuehaseeb2018-03-031-0/+1
| |
| * closed by added to all_models.ymlhaseeb2018-03-011-0/+1
| |
| * closedby_id added to safe attributeshaseeb2018-03-012-2/+2
| |
| * added new field into safe modelhaseeb2018-02-281-0/+1
| |
| * removed hasmany association from usershaseeb2018-02-281-1/+0
| |
| * schema version changehaseeb2018-02-281-1/+1
| |
| * documentation updatedhaseeb2018-02-281-0/+27
| |
| * schema version changehaseeb2018-02-281-1/+1
| |
| * added forign key and specshaseeb2018-02-284-1/+15
| |
| * closed by field addedhaseeb2018-02-284-0/+16
| |
* | Merge branch 'nested-restore-changelog' into 'master'Douwe Maan2018-03-301-0/+5
|\ \ | | | | | | | | | | | | Add changelog entry for rake task fix See merge request gitlab-org/gitlab-ce!18112
| * | Add changelog entryBalasankar "Balu" C2018-03-301-0/+5
|/ /
* | Merge branch 'sh-cleanup-pages-worker' into 'master'Nick Thomas2018-03-302-0/+8
|\ \ | | | | | | | | | | | | Free open file descriptors and libgit2 buffers in UpdatePagesService See merge request gitlab-org/gitlab-ce!18099
| * | Free open file descriptors and libgit2 buffers in UpdatePagesServicesh-cleanup-pages-workerStan Hu2018-03-302-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | In UpdatePagesService, we were seeing a large number of open pack files in production. Calling Project#cleanup removes a reference to Rugged::Repository and forces libgit2 to close file descriptors and free its internal memory cache. Relates to https://gitlab.com/gitlab-com/infrastructure/issues/3965#note_65837525
* | | 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