| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | refactors git push service spec codebackport-refator-git-push-service-spec | Tiago Botelho | 2017-07-28 | 1 | -100/+99 |
| | | |||||
| * | Merge branch 'bvl-add-all-settings-to-api' into 'master' | Robert Speicher | 2017-07-27 | 8 | -170/+102 |
| |\ | | | | | | | | | Add all ApplicationSettings attributes to the API See merge request !12851 | ||||
| | * | Remove deprecated `repository_storage` attributebvl-add-all-settings-to-api | Bob Van Landuyt | 2017-07-27 | 4 | -60/+6 |
| | | | | | | | | | In favor of the new `repository_storages` | ||||
| | * | Make the attribute list for application settings reusable | Bob Van Landuyt | 2017-07-27 | 5 | -110/+96 |
| | | | |||||
| * | | Merge branch 'gitaly-all-branches' into 'master' | Robert Speicher | 2017-07-27 | 5 | -319/+77 |
| |\ \ | | | | | | | | | | | | | | | | | | | Incorporate RefsService.FindAllBranches Gitaly RPC Closes gitaly#408 See merge request !13027 | ||||
| | * | | Incorporate RefsService.FindAllBranches Gitaly RPCgitaly-all-branches | Alejandro Rodríguez | 2017-07-27 | 5 | -7/+40 |
| | | | | |||||
| | * | | Improve Gitlab::Git::Repository specs for #branches | Alejandro Rodríguez | 2017-07-27 | 1 | -14/+39 |
| | | | | |||||
| | * | | Remove unused Gitlab::Git operations | Alejandro Rodríguez | 2017-07-27 | 2 | -300/+0 |
| | | | | |||||
| * | | | Merge branch 'ch-test-removal' into 'master' | Jacob Schatz | 2017-07-27 | 1 | -1/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | Remove unused haml file See merge request !13090 | ||||
| | * | | | Test remove potentially unused filech-test-removal | Clement Ho | 2017-07-26 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'update-server-terms-for-ha-docs' into 'master' | Drew Blessing | 2017-07-27 | 1 | -9/+9 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Update server terminolgy to differentiate HA setups from Geo See merge request !13139 | ||||
| | * | | | Update server terminolgy to differentiate HA setups from Geo | Chenjerai Katanda | 2017-07-27 | 1 | -9/+9 |
| |/ / / | |||||
| * | | | Merge branch 'feature/migrate-repository-tags-to-gitaly' into 'master' | Robert Speicher | 2017-07-27 | 6 | -31/+80 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#tags to Gitaly Closes gitaly#411 See merge request !13092 | ||||
| | * | | | Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitaly | Ahmad Sherif | 2017-07-27 | 6 | -31/+80 |
| | | | | | | | | | | | | | | | | | Closes gitaly#411 | ||||
| * | | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master' | Robert Speicher | 2017-07-27 | 9 | -9/+81 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent concurrent editing wiki Closes #1827 See merge request !9707 | ||||
| | * | | | | Encapsulate the commit.sha logic | Hiroyuki Sato | 2017-07-27 | 3 | -6/+32 |
| | | | | | | |||||
| | * | | | | Use simplified route | Hiroyuki Sato | 2017-07-27 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Remove unnecessary code | Hiroyuki Sato | 2017-07-26 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Update changelog appropriately | Hiroyuki Sato | 2017-07-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix error of spinach test | Hiroyuki Sato | 2017-07-23 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Refactor: use keyword arguments for optional parameters | Hiroyuki Sato | 2017-07-23 | 3 | -4/+4 |
| | | | | | | |||||
| | * | | | | Change double quotes to single quotes | Hiroyuki Sato | 2017-07-23 | 1 | -7/+7 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into 1827-prevent-concurrent-editing-wiki | Hiroyuki Sato | 2017-07-23 | 6307 | -80247/+297186 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/projects/wikis_controller.rb app/views/projects/wikis/edit.html.haml spec/features/projects/wiki/user_updates_wiki_page_spec.rb | ||||
| | * | | | | | Refactor spec | Hiroyuki Sato | 2017-03-09 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Prevent concurrent editing wiki | Hiroyuki Sato | 2017-03-08 | 8 | -8/+54 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'docs-new-topic-user-profile' into 'master' | Job van der Voort | 2017-07-27 | 5 | -14/+55 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs new topic: "user/profile/index" See merge request !12611 | ||||
| | * | | | | | | Docs new topic: "user/profile/index" | Marcia Ramos | 2017-07-27 | 5 | -14/+55 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'docs-new-topic-user-project-repo-index' into 'master' | Job van der Voort | 2017-07-27 | 8 | -6/+240 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs new topic "user/project/repository/index.md" Closes #27653 and #28665 See merge request !12598 | ||||
| | * | | | | | | Docs new topic "user/project/repository/index.md" | Marcia Ramos | 2017-07-27 | 8 | -6/+240 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'remove_blob_by_oid' into 'master' | Robert Speicher | 2017-07-27 | 1 | -4/+0 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Removed `Repository#blob_by_oid` unused method See merge request !13111 | ||||
| | * | | | | | Removed `Repository#blob_by_oid` unused methodremove_blob_by_oid | Andrew Newdigate | 2017-07-26 | 1 | -4/+0 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'backport-ee-2456' into 'master' | Robert Speicher | 2017-07-27 | 12 | -8/+57 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Skip OAuth authorization for trusted applications See merge request !13061 | ||||
| | * | | | | | Use params#require instead params[] access | Oswaldo Ferreira | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Backport gitlab-ee!2456 | Oswaldo Ferreira | 2017-07-27 | 12 | -8/+57 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'remove_custom_devise_failure_app' into 'master' | Robert Speicher | 2017-07-27 | 2 | -29/+6 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove GitLab custom failure app for Devise See merge request !13136 | ||||
| | * | | | | | | Remove GitLab custom fealure app for devise | Valery Sizov | 2017-07-27 | 2 | -29/+6 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'harish-update-backup-restore-docs' into 'master' | Achilleas Pipinellis | 2017-07-27 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that instance types must match when restoring a backup See merge request !12639 | ||||
| | * | | | | | | | Docs: Specify that backup restoration must be of the same type | Harish Ramachandran | 2017-07-04 | 1 | -7/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master' | Robert Speicher | 2017-07-27 | 4 | -3/+11 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix prometheus client pid reuse bug See merge request !13130 | ||||
| | * | | | | | | | | Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_error | Pawel Chojnacki | 2017-07-27 | 4 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unicorn forking new workers. | ||||
| * | | | | | | | | | Merge branch '35577-fix-image-blob-display-due-to-lazy-image-loading' into ↵ | Sean McGivern | 2017-07-27 | 3 | -10/+11 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Fix Image Blob Display due to lazy Image Loading" Closes #35577 See merge request !13104 | ||||
| | * | | | | | | | | | Changed Images in Blob Viewer to image_tag35577-fix-image-blob-display-due-to-lazy-image-loading | Tim Zallmann | 2017-07-27 | 3 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated documentation about the lazy class | ||||
| | * | | | | | | | | | Added lazy class to Blob Images + Diffs | Tim Zallmann | 2017-07-27 | 2 | -8/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'feature/gpg-signed-commits' into 'master' | Dmitriy Zaporozhets | 2017-07-27 | 78 | -39/+2077 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GPG signed commits Closes #20268 See merge request !9546 | ||||
| | * | | | | | | | | | add "GPG Keys" to new navigation | Alexis Reigel | 2017-07-27 | 1 | -0/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | remove log statements from workers | Alexis Reigel | 2017-07-27 | 4 | -30/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | improve gpg key validation | Alexis Reigel | 2017-07-27 | 2 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when omitting the end part of the key ('-----END PGP PUBLIC KEY BLOCK-----') the error message was not about the key anymore, but about the missing fingerprint and primary_keyid, which was confusing for the user. the new validation checks that the end also matches the expected format. | ||||
| | * | | | | | | | | | optimize query, only select relevant db columns | Alexis Reigel | 2017-07-27 | 2 | -11/+54 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | add unique index for gpg_signatures#commit_sha | Alexis Reigel | 2017-07-27 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | validate the foreign_key instead of the relation | Alexis Reigel | 2017-07-27 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |