summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeoutRobert Speicher2017-08-222-10/+15
* Fix a potential timeout in `Gitlab::Logger.read_latest`Robert Speicher2017-08-221-6/+2
* Merge branch 'git-gc-raise-lease-timeotu' into 'master'Sean McGivern2017-08-222-1/+5
|\
| * Raise GC Lease Timeout to 24hgit-gc-raise-lease-timeotuKim "BKC" Carlbäcker2017-08-222-1/+5
* | Merge branch 'fix/sm/34762-bad-validation-message' into 'master'Kamil Trzciński2017-08-223-2/+10
|\ \
| * | Update kubernetes_service_spec.rbfix/sm/34762-bad-validation-messageShinya Maeda2017-08-221-1/+1
| * | Enfouce namespace for Kubernetes to lowercaseShinya Maeda2017-08-223-2/+10
* | | Merge branch '36721-rename-repo-text' into 'master'Annabel Dunstone Gray2017-08-221-2/+0
|\ \ \
| * | | 36721 Remove incorrect paragraph regarding renaming repos in settings36721-rename-repo-texttauriedavis2017-08-211-2/+0
* | | | Merge branch 'zj-fix-import-gitlab-export-form' into 'master'Douwe Maan2017-08-223-40/+49
|\ \ \ \
| * | | | Update form to properly set the pathZeger-Jan van de Weg2017-08-223-40/+49
* | | | | Merge branch 'fix/import-fork-mr' into 'master'Sean McGivern2017-08-226-2/+29
|\ \ \ \ \
| * | | | | fix static analysisfix/import-fork-mrJames Lopez2017-08-221-2/+0
| * | | | | fix specsJames Lopez2017-08-221-1/+6
| * | | | | add changelogJames Lopez2017-08-211-0/+5
| * | | | | Fix fork MRs importing issueJames Lopez2017-08-215-2/+21
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-broadcast-message-caching' into 'master'Sean McGivern2017-08-223-5/+55
|\ \ \ \ \
| * | | | | Fix caching of future broadcast messagesfix-broadcast-message-cachingYorick Peterse2017-08-213-5/+55
| |/ / / /
* | | | | Update VERSION to 9.6.0-prev9.6.0.preSimon Knox2017-08-221-1/+1
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSimon Knox2017-08-224-33/+94
|\ \ \ \ \
| * \ \ \ \ Merge branch '34533-inline-single-authorized-projects' into 'master'Douwe Maan2017-08-224-33/+94
| |\ \ \ \ \
| | * | | | | Use event-based waiting in Gitlab::JobWaiterNick Thomas2017-08-224-33/+94
* | | | | | | Update CHANGELOG.md for 9.5.0Simon Knox2017-08-22148-604/+166
|/ / / / / /
* | | | | | Merge branch '35845-improve-subgroup-creation-permissions' into 'master'Douwe Maan2017-08-228-12/+74
|\ \ \ \ \ \
| * | | | | | Improves subgroup creation permissions35845-improve-subgroup-creation-permissionsTiago Botelho2017-08-218-12/+74
* | | | | | | Merge branch '28283-uuid-storage' into 'master'Douwe Maan2017-08-2221-162/+498
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Make sure repository's removal work for legacy and hashed storages28283-uuid-storageGabriel Mazetto2017-08-227-8/+67
| * | | | | | Use `@hashed` prefix for hashed paths on disk, to avoid collision with existi...Gabriel Mazetto2017-08-222-5/+7
| * | | | | | Refactor project and storage typesGabriel Mazetto2017-08-227-87/+69
| * | | | | | Prevent using gitlab import task when hashed storage is enabledGabriel Mazetto2017-08-221-0/+6
| * | | | | | Some codestyle changes and fixes for GitLab pagesGabriel Mazetto2017-08-222-10/+20
| * | | | | | Removed some useless code, codestyle changes and removed an indexGabriel Mazetto2017-08-226-12/+7
| * | | | | | Fix repository reloading in some specsGabriel Mazetto2017-08-223-4/+8
| * | | | | | ChangelogGabriel Mazetto2017-08-221-0/+4
| * | | | | | Moving away from the "extend" based factory to a more traditional one.Gabriel Mazetto2017-08-225-36/+54
| * | | | | | Enable automatic hashed storage for new projects by application settingsGabriel Mazetto2017-08-225-0/+35
| * | | | | | New storage is now "Hashed" instead of "UUID"Gabriel Mazetto2017-08-228-88/+203
| * | | | | | Add UUID Storage to ProjectGabriel Mazetto2017-08-224-1/+108
| * | | | | | Move create_repository back to project model as we can use disk_path and shar...Gabriel Mazetto2017-08-222-13/+13
| * | | | | | Codestyle: move hooks to the same place and move dependent methods to privateGabriel Mazetto2017-08-221-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-docsRobert Speicher2017-08-212-2/+16
|\ \ \ \ \ \
| * | | | | | Correctly encode string params for Gitaly's TreeEntries RPCgitaly-tree-entries-encodingAlejandro Rodríguez2017-08-212-2/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '36298-use-non-i18n-values-for-setting-new-group-level-issue-mr-...Clement Ho2017-08-2111-27/+69
|\ \ \ \ \ \
| * | | | | | Use non-i18n values for setting new group-level issue/MR button textBryce Johnson2017-08-2111-27/+69
|/ / / / / /
* | | | | | Merge branch '36533-add-docs-for-group-issues-page-and-group-merge-requests-p...Marcia Ramos2017-08-2110-8/+60
|\ \ \ \ \ \
| * | | | | | indexes external issue trackerMarcia Ramos2017-08-211-0/+6
| * | | | | | copyeditMarcia Ramos2017-08-214-21/+25
| * | | | | | indexes user/search/ from /user/indexMarcia Ramos2017-08-211-0/+4
| * | | | | | Wording36533-add-docs-for-group-issues-page-and-group-merge-requests-pageVictor Wu2017-08-211-5/+5
| * | | | | | Cross link to groups docsVictor Wu2017-08-211-0/+7
View Lorry Controller Status