Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rails5-flatten' into 'master' | Grzegorz Bizon | 2018-06-01 | 1 | -3/+5 |
|\ | | | | | | | | | | | | | Fix project team members count Closes #46283 See merge request gitlab-org/gitlab-ce!19195 | ||||
| * | Fix project team members count | Jan Provaznik | 2018-05-29 | 1 | -3/+5 |
| | | | | | | | | | | | | | | In Rails 5 `project.team.members` returns a CollectionProxy instead of array, which causes that `.flatten` fails. Although we could update the call to get distinct count directly with sql query, in this case it's better to re-use the list of members which is being loaded anyway. | ||||
* | | Merge branch 'sh-batch-dependent-destroys' into 'master' | Robert Speicher | 2018-05-29 | 1 | -1/+7 |
|\ \ | |/ |/| | | | | | | | | | Fix project destruction failing due to idle in transaction timeouts Closes #44610 See merge request gitlab-org/gitlab-ce!18609 | ||||
| * | Fix project destruction failing due to idle in transaction timeoutssh-batch-dependent-destroys | Stan Hu | 2018-05-24 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | When deleting associated records, Rails loads all associations into memory (https://github.com/rails/rails/issues/22510) before destroying them. This can cause a surge in memory and cause destruction of objects to fail due to idle in transaction database timeouts. This fix is inspired from https://github.com/thisismydesign to destroy `has_many` relationships in batches. Closes #44610 | ||||
* | | 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 |
| | | |||||
* | | Fix sidebar issue countissue_38418 | Felipe Artur | 2018-05-24 | 1 | -5/+33 |
|/ | |||||
* | Include project.full_path when moving repo | Ash McKenzie | 2018-05-10 | 1 | -1/+1 |
| | | | | This is especially helpful when hashed storage is enabled | ||||
* | Backports every CE related change from ee-5484 to CE | Tiago Botelho | 2018-05-07 | 1 | -0/+30 |
| | |||||
* | Merge branch '4084-epics-username-autocomplete-ce' into 'master' | Douwe Maan | 2018-05-07 | 1 | -31/+1 |
|\ | | | | | | | | | Backport CE changes from "autocomplete usernames in Epic comments/description" See merge request gitlab-org/gitlab-ce!18605 | ||||
| * | Backport of 4084-epics-username-autocomplete | Mario de la Ossa | 2018-05-04 | 1 | -31/+1 |
| | | |||||
* | | Backports every CE related change from ee-44542 to CE | Tiago Botelho | 2018-05-04 | 1 | -1/+1 |
|/ | |||||
* | InvaildStateError -> InvalidStateError | Nick Thomas | 2018-04-27 | 1 | -9/+9 |
| | |||||
* | Don't automatically remove artifacts for pages jobs after pages:deploy has run | Nick Thomas | 2018-04-27 | 1 | -9/+2 |
| | |||||
* | Gitlab::Shell works on shard name, not path | Zeger-Jan van de Weg | 2018-04-25 | 3 | -7/+7 |
| | | | | | | | | | | | Direct disk access is done through Gitaly now, so the legacy path was deprecated. This path was used in Gitlab::Shell however. This required the refactoring in this commit. Added is the removal of direct path access on the project model, as that lookup wasn't needed anymore is most cases. Closes https://gitlab.com/gitlab-org/gitaly/issues/1111 | ||||
* | Respect visibility options and description when importing project from template | Francisco Javier López | 2018-04-19 | 1 | -1/+2 |
| | |||||
* | Resolve "Make a Rubocop that forbids returning from a block" | 🙈 jacopo beschi 🙉 | 2018-04-18 | 1 | -1/+1 |
| | |||||
* | Extend API for importing a project export with overwrite support | Francisco Javier López | 2018-04-06 | 13 | -5/+440 |
| | |||||
* | Merge branch 'remove-pages-tar-support' into 'master' | Kamil Trzciński | 2018-04-06 | 1 | -13/+1 |
|\ | | | | | | | | | Remove support for legacy tar.gz pages artifacts See merge request gitlab-org/gitlab-ce!18090 | ||||
| * | Remove support for legacy tar.gz pages artifacts | Jacob Vosmaer | 2018-04-03 | 1 | -13/+1 |
| | | |||||
* | | Cache personal projects count. | Andreas Brandl | 2018-04-06 | 3 | -0/+6 |
| | | | | | | | | Closes #37462. | ||||
* | | Merge branch 'bvl-override-import-params' into 'master' | Douwe Maan | 2018-04-05 | 1 | -2/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | Allow passing params to import API to override project attributes Closes gitlab-ee#4788 See merge request gitlab-org/gitlab-ce!18086 | ||||
| * | | Store override params as import data on projects | Bob Van Landuyt | 2018-04-04 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means import data doesn't necessarily have to have an import_url anymore. The `ProjectImportData` could just contain the override data in it's serialized data attribute. The import data is automatically cleaned up after it is finished by the state machine. | ||||
* | | | Export LFS Objects when exporting a project | Bob Van Landuyt | 2018-04-05 | 1 | -1/+5 |
|/ / | | | | | | | The LFS files will be included in the `lfs-objects` directory in the archive. | ||||
* | | Allow assigning and filtering issuables by ancestor group labels | Felipe Artur | 2018-04-04 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' ↵ | Sean McGivern | 2018-04-04 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | | | | | into 'master' Use shard name in Git::GitlabProjects instead of shard path Closes gitaly#1110 See merge request gitlab-org/gitlab-ce!18015 | ||||
| * | Use shard name in Git::GitlabProjects instead of shard path | Ahmad Sherif | 2018-04-03 | 1 | -1/+1 |
| | | | | | | | | Closes gitaly#1110 | ||||
* | | Merge branch 'fix/sm/fix-wrong-error-handling-in-update-page-service' into ↵ | Kamil Trzciński | 2018-04-03 | 1 | -8/+11 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix wrong error handling in update page service Closes #44817 See merge request gitlab-org/gitlab-ce!18098 | ||||
| * | | missing the public folder is InvaildStateErrorfix/sm/fix-wrong-error-handling-in-update-page-service | Shinya Maeda | 2018-03-30 | 1 | -1/+2 |
| | | | |||||
| * | | Fix bad naming | Shinya Maeda | 2018-03-30 | 1 | -2/+2 |
| | | | |||||
| * | | Fix wrong error handling in update page service | Shinya Maeda | 2018-03-30 | 1 | -7/+9 |
| |/ | |||||
* | | Raise more descriptive errors when URLs are blocked | Douwe Maan | 2018-04-02 | 1 | -1/+5 |
| | | |||||
* | | Extend API for exporting a project with direct upload URL | Francisco Javier López | 2018-03-30 | 1 | -8/+25 |
| | | |||||
* | | Free open file descriptors and libgit2 buffers in UpdatePagesServicesh-cleanup-pages-worker | Stan Hu | 2018-03-30 | 1 | -0/+3 |
|/ | | | | | | | | | 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 ↵ | Douwe Maan | 2018-03-28 | 1 | -9/+14 |
|\ | | | | | | | | | | | | | | | | | '44392-resolve-projects-creation-silently-failing-on-after-create-error' into 'master' Resolve "For new created projects permissions are not inherited from group level" Closes #44692 See merge request gitlab-org/gitlab-ce!18013 | ||||
| * | When a Service templates are invalid newly created projects will have them ↵ | Tiago Botelho | 2018-03-28 | 1 | -1/+3 |
| | | | | | | | | inactive | ||||
| * | Project creation does not fail silently on DB related changes | Tiago Botelho | 2018-03-27 | 1 | -8/+11 |
| | | |||||
* | | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 1 | -7/+11 |
|\ \ | | | | | | | | | | | | | | | | | | | Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358 | ||||
| * \ | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 3 | -3/+7 |
| |\ \ | |||||
| * | | | apply feedback | Micaël Bergeron | 2018-03-09 | 1 | -8/+13 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-08 | 4 | -13/+32 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 4 | -22/+23 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵ | Kamil Trzciński | 2018-02-28 | 3 | -10/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'" | Kamil Trzciński | 2018-02-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8. | ||||
| * | | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867 | ||||
| * | | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵ | Kamil Trzciński | 2018-02-28 | 5 | -14/+30 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ \ \ | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵ | Kamil Trzciński | 2018-02-28 | 17 | -131/+335 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ \ \ \ | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵ | Kamil Trzciński | 2018-02-28 | 6 | -9/+40 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ \ \ \ \ | Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into ↵ | Kamil Trzciński | 2018-02-28 | 6 | -2/+106 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport |