Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes group policy specs on MySQL.fix-group-policy-specs-on-mysql | Tiago Botelho | 2017-08-22 | 1 | -0/+6 |
| | |||||
* | Merge branch '36721-rename-repo-text' into 'master' | Annabel Dunstone Gray | 2017-08-22 | 1 | -2/+0 |
|\ | | | | | | | | | | | | | 36721 Remove incorrect paragraph regarding renaming repos in settings Closes #36721 See merge request !13718 | ||||
| * | 36721 Remove incorrect paragraph regarding renaming repos in settings36721-rename-repo-text | tauriedavis | 2017-08-21 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'zj-fix-import-gitlab-export-form' into 'master' | Douwe Maan | 2017-08-22 | 3 | -40/+49 |
|\ \ | | | | | | | | | | | | | | | | | | | Update form to properly set the path Closes #36519 See merge request !13722 | ||||
| * | | Update form to properly set the path | Zeger-Jan van de Weg | 2017-08-22 | 3 | -40/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also includes a change in allowing uploaded files, as there was a mismatch in object_id between classes, disallowing params[:file], which is a UploadedFile, newly loaded. The params checked against the older version. Fixes gitlab-org/gitlab-ce#36519 | ||||
* | | | Merge branch 'fix/import-fork-mr' into 'master' | Sean McGivern | 2017-08-22 | 6 | -2/+29 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix Import/Export issue to do with fork merge requests Closes #36666 See merge request !13717 | ||||
| * | | | fix static analysisfix/import-fork-mr | James Lopez | 2017-08-22 | 1 | -2/+0 |
| | | | | |||||
| * | | | fix specs | James Lopez | 2017-08-22 | 1 | -1/+6 |
| | | | | |||||
| * | | | add changelog | James Lopez | 2017-08-21 | 1 | -0/+5 |
| | | | | |||||
| * | | | Fix fork MRs importing issue | James Lopez | 2017-08-21 | 5 | -2/+21 |
| | | | | |||||
* | | | | Merge branch 'fix-broadcast-message-caching' into 'master' | Sean McGivern | 2017-08-22 | 3 | -5/+55 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix caching of future broadcast messages Closes #36661 See merge request !13667 | ||||
| * | | | | Fix caching of future broadcast messagesfix-broadcast-message-caching | Yorick Peterse | 2017-08-21 | 3 | -5/+55 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the caching mechanism so we cache both current _and_ future broadcast messages, then manually filter out those we don't want to display. This ensures we don't need any additional queries while still being able to display the right messages at the right time. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36661 | ||||
* | | | | Update VERSION to 9.6.0-prev9.6.0.pre | Simon Knox | 2017-08-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Simon Knox | 2017-08-22 | 4 | -33/+94 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '34533-inline-single-authorized-projects' into 'master' | Douwe Maan | 2017-08-22 | 4 | -33/+94 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use an event-based system when waiting for AuthorizedProjectsWorker to complete See merge request !13564 | ||||
| | * | | | | Use event-based waiting in Gitlab::JobWaiter | Nick Thomas | 2017-08-22 | 4 | -33/+94 |
| | | | | | | |||||
* | | | | | | Update CHANGELOG.md for 9.5.0 | Simon Knox | 2017-08-22 | 148 | -604/+166 |
|/ / / / / | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge branch '35845-improve-subgroup-creation-permissions' into 'master' | Douwe Maan | 2017-08-22 | 8 | -12/+74 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves subgroup creation permissions Closes #35845 See merge request !13418 | ||||
| * | | | | | Improves subgroup creation permissions35845-improve-subgroup-creation-permissions | Tiago Botelho | 2017-08-21 | 8 | -12/+74 |
| | | | | | | |||||
* | | | | | | Merge branch '28283-uuid-storage' into 'master' | Douwe Maan | 2017-08-22 | 21 | -162/+498 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hashed Storage support for Repositories Closes #28283 See merge request !13246 | ||||
| * | | | | | | Make sure repository's removal work for legacy and hashed storages28283-uuid-storage | Gabriel Mazetto | 2017-08-22 | 7 | -8/+67 |
| | | | | | | | |||||
| * | | | | | | Use `@hashed` prefix for hashed paths on disk, to avoid collision with ↵ | Gabriel Mazetto | 2017-08-22 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | existing ones | ||||
| * | | | | | | Refactor project and storage types | Gabriel Mazetto | 2017-08-22 | 7 | -87/+69 |
| | | | | | | | |||||
| * | | | | | | Prevent using gitlab import task when hashed storage is enabled | Gabriel Mazetto | 2017-08-22 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Some codestyle changes and fixes for GitLab pages | Gabriel Mazetto | 2017-08-22 | 2 | -10/+20 |
| | | | | | | | |||||
| * | | | | | | Removed some useless code, codestyle changes and removed an index | Gabriel Mazetto | 2017-08-22 | 6 | -12/+7 |
| | | | | | | | |||||
| * | | | | | | Fix repository reloading in some specs | Gabriel Mazetto | 2017-08-22 | 3 | -4/+8 |
| | | | | | | | |||||
| * | | | | | | Changelog | Gabriel Mazetto | 2017-08-22 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Moving away from the "extend" based factory to a more traditional one. | Gabriel Mazetto | 2017-08-22 | 5 | -36/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `extend` dynamically can lead to bad performance as it invalidates the method's cache. | ||||
| * | | | | | | Enable automatic hashed storage for new projects by application settings | Gabriel Mazetto | 2017-08-22 | 5 | -0/+35 |
| | | | | | | | |||||
| * | | | | | | New storage is now "Hashed" instead of "UUID" | Gabriel Mazetto | 2017-08-22 | 8 | -88/+203 |
| | | | | | | | |||||
| * | | | | | | Add UUID Storage to Project | Gabriel Mazetto | 2017-08-22 | 4 | -1/+108 |
| | | | | | | | |||||
| * | | | | | | Move create_repository back to project model as we can use disk_path and ↵ | Gabriel Mazetto | 2017-08-22 | 2 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | share it | ||||
| * | | | | | | Codestyle: move hooks to the same place and move dependent methods to private | Gabriel Mazetto | 2017-08-22 | 1 | -19/+18 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'gitaly-tree-entries-encoding' into 'master'36778-url-redirection-from-old-note-attachments-path-to-new-uploads-path-not-working36775-move-helm-chart-data-to-gitlab-ce-repo-instead-of-omnibus-docs | Robert Speicher | 2017-08-21 | 2 | -2/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly encode string params for Gitaly's TreeEntries RPC Closes #36720 See merge request !13724 | ||||
| * | | | | | | Correctly encode string params for Gitaly's TreeEntries RPCgitaly-tree-entries-encoding | Alejandro Rodríguez | 2017-08-21 | 2 | -2/+16 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch ↵ | Clement Ho | 2017-08-21 | 11 | -27/+69 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36298-use-non-i18n-values-for-setting-new-group-level-issue-mr-button-text' into 'master' Use non-i18n values for setting new group-level issue/MR button text Closes #36298 See merge request !13570 | ||||
| * | | | | | | Use non-i18n values for setting new group-level issue/MR button text | Bryce Johnson | 2017-08-21 | 11 | -27/+69 |
|/ / / / / / | |||||
* | | | | | | Merge branch ↵ | Marcia Ramos | 2017-08-21 | 10 | -8/+60 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36533-add-docs-for-group-issues-page-and-group-merge-requests-page' into 'master' Add docs for group issues page and group merge requests page Closes #36533 See merge request !13678 | ||||
| * | | | | | | indexes external issue tracker | Marcia Ramos | 2017-08-21 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | copyedit | Marcia Ramos | 2017-08-21 | 4 | -21/+25 |
| | | | | | | | |||||
| * | | | | | | indexes user/search/ from /user/index | Marcia Ramos | 2017-08-21 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Wording36533-add-docs-for-group-issues-page-and-group-merge-requests-page | Victor Wu | 2017-08-21 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Cross link to groups docs | Victor Wu | 2017-08-21 | 1 | -0/+7 |
| | | | | | | | |||||
| * | | | | | | Issue tracker | Victor Wu | 2017-08-21 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge requests search and filtering | Victor Wu | 2017-08-18 | 1 | -0/+251 |
| | | | | | | | |||||
| * | | | | | | Delete index.md | Victor Wu | 2017-08-18 | 1 | -251/+0 |
| | | | | | | | |||||
| * | | | | | | Punctuation. | Victor Wu | 2017-08-18 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Search and filter results. | Victor Wu | 2017-08-18 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Update search and filter links | Victor Wu | 2017-08-18 | 1 | -1/+3 |
| | | | | | | |