Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sh-fix-lograge-exception' into 'master' | Sean McGivern | 2017-07-28 | 1 | -1/+1 |
|\ | |||||
| * | Fix lograge exclusion in params sectionsh-fix-lograge-exception | Stan Hu | 2017-07-28 | 1 | -1/+1 |
* | | Merge branch '32483-jira-error' into 'master' | Sean McGivern | 2017-07-28 | 6 | -13/+38 |
|\ \ | |||||
| * | | Display specific error message when JIRA test fails32483-jira-error | Jarka Kadlecova | 2017-07-27 | 6 | -13/+38 |
* | | | Merge branch '35667-indicate-type-of-metric-for-prometheus-web-application-mo... | Tim Zallmann | 2017-07-28 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | Rename the metric groups35667-indicate-type-of-metric-for-prometheus-web-application-monitoring | Joshua Lambert | 2017-07-27 | 1 | -4/+4 |
* | | | | Merge branch '35657-fix-prometheus-docs-to-indicate-kubernetes-is-not-require... | Achilleas Pipinellis | 2017-07-28 | 1 | -2/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Update environments.md35657-fix-prometheus-docs-to-indicate-kubernetes-is-not-required-docs | Joshua Lambert | 2017-07-27 | 1 | -2/+1 |
* | | | | Merge branch 'bvl-add-all-settings-to-api' into 'master' | Robert Speicher | 2017-07-27 | 8 | -170/+102 |
|\ \ \ \ | |||||
| * | | | | Remove deprecated `repository_storage` attributebvl-add-all-settings-to-api | Bob Van Landuyt | 2017-07-27 | 4 | -60/+6 |
| * | | | | 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 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | 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 Gitalyfeature/migrate-repository-tags-to-gitaly | Ahmad Sherif | 2017-07-27 | 6 | -31/+80 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master' | Robert Speicher | 2017-07-27 | 9 | -9/+81 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 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" | 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" | 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 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 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | 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 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_error | Pawel Chojnacki | 2017-07-27 | 4 | -3/+11 |
* | | | | | | | | | | Merge branch '35577-fix-image-blob-display-due-to-lazy-image-loading' into 'm... | Sean McGivern | 2017-07-27 | 3 | -10/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | Added lazy class to Blob Images + Diffs | Tim Zallmann | 2017-07-27 | 2 | -8/+8 |