Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible... | Mayra Cabrera | 2018-06-20 | 9 | -34/+59 |
* | Merge branch 'docs/master-maintainer-note' into 'master' | Marcia Ramos | 2018-06-20 | 1 | -1/+13 |
|\ | |||||
| * | Add note about Master/Maintainer role | Achilleas Pipinellis | 2018-06-20 | 1 | -1/+13 |
* | | Merge branch 'rails5-fix-48142' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -1/+6 |
|\ \ | |||||
| * | | Rails5 fix Admin::HooksController | Jasper Maes | 2018-06-20 | 2 | -1/+6 |
* | | | Merge branch '48100-fix-branch-not-shown' into 'master' | Rémy Coutable | 2018-06-20 | 3 | -2/+24 |
|\ \ \ | |_|/ |/| | | |||||
| * | | The json keys of ref switcher should not be translatedhiroponz/gitlab-ce-48100-fix-branch-not-shown | Hiroyuki Sato | 2018-06-20 | 3 | -2/+24 |
* | | | Merge branch 'clear-up-background-type-change-docs' into 'master' | Yorick Peterse | 2018-06-20 | 1 | -0/+47 |
|\ \ \ | |||||
| * | | | Add docs for the cleanup step of a background column type changeclear-up-background-type-change-docs | Sean McGivern | 2018-06-19 | 1 | -0/+47 |
* | | | | Merge branch 'rails5-fix-48141' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | Rails5 fix expected: 0 times with any arguments received: 1 time with argume... | Jasper Maes | 2018-06-20 | 2 | -1/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'go-1.10-source-installs' into 'master' | Nick Thomas | 2018-06-20 | 2 | -11/+11 |
|\ \ \ \ | |||||
| * | | | | Use Go 1.10 for source installationsgo-1.10-source-installs | Jacob Vosmaer | 2018-06-19 | 2 | -11/+11 |
* | | | | | Merge branch 'use-backup-custom-hooks-gitaly' into 'master' | Douwe Maan | 2018-06-20 | 7 | -70/+119 |
|\ \ \ \ \ | |||||
| * | | | | | Move backup custom hooks up a leveluse-backup-custom-hooks-gitaly | Ahmad Hassan | 2018-06-20 | 1 | -4/+2 |
| * | | | | | Output done for wiki and repo | Ahmad Hassan | 2018-06-19 | 1 | -14/+3 |
| * | | | | | Migrate repo backup to gitaly | Ahmad Hassan | 2018-06-15 | 7 | -60/+122 |
* | | | | | | Merge branch 'rails5-fix-48104' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -1/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false})... | Jasper Maes | 2018-06-19 | 2 | -1/+12 |
* | | | | | | | Merge branch 'rails5-fix-pages-controller' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -2/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Rails5 fix Projects::PagesController spec | Jasper Maes | 2018-06-19 | 2 | -2/+7 |
* | | | | | | | | Merge branch 'gitaly-disk-access-5' into 'master' | Douwe Maan | 2018-06-20 | 6 | -1/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | More gitaly disk access blocks | Jacob Vosmaer (GitLab) | 2018-06-20 | 6 | -1/+9 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'ce-5024-filename-search' into 'master' | Sean McGivern | 2018-06-20 | 8 | -6/+186 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Implement filtering by filename on code searchce-5024-filename-search | Mario de la Ossa | 2018-06-19 | 8 | -6/+186 |
* | | | | | | | | | Merge branch '48105-git-version-detection-using-gitaly' into 'master' | Sean McGivern | 2018-06-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use gitaly to figure out git version for usage ping48105-git-version-detection-using-gitaly | Balasankar "Balu" C | 2018-06-19 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch '47959-rails5-redis-timewithzone' into 'master' | Sean McGivern | 2018-06-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix redis_cacheable deserialization47959-rails5-redis-timewithzone | Mario de la Ossa | 2018-06-19 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'patch-28' into 'master' | Rémy Coutable | 2018-06-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Point out the specific anchor inside the document | Matthieu Fronton | 2018-06-19 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'zj-lfs-pointers' into 'master' | Douwe Maan | 2018-06-20 | 2 | -94/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | LFS changes are detected by Gitalyzj-lfs-pointers | Zeger-Jan van de Weg | 2018-06-19 | 2 | -94/+7 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'text-expander-icon-update' into 'master' | Tim Zallmann | 2018-06-20 | 6 | -7/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Updated horizontal ellipsis icon for text-expander | Constance Okoghenun | 2018-06-20 | 6 | -7/+28 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'docs/correct-curl-syntax' into 'master' | Stan Hu | 2018-06-20 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Correct cURL syntax | Henrik Hüttemann | 2018-06-20 | 1 | -4/+4 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '48025-branch-name-status-color-is-not-correct-anymore' into 'ma... | Tim Zallmann | 2018-06-19 | 3 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Resolve "Branch name status color is not correct anymore" | Clement Ho | 2018-06-19 | 3 | -5/+9 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'leipert-proper-eslint-report' into 'master' | Mike Greiling | 2018-06-19 | 2 | -3/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | use eslint config parameter instead of sedleipert-proper-eslint-report | Lukas Eipert | 2018-06-16 | 2 | -3/+1 |
* | | | | | | | | | | Merge branch '46250-remove-commented-from-comment-system-notes' into 'master' | Mike Greiling | 2018-06-19 | 3 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Resolve "Remove “commented” from comment system notes" | Constance Okoghenun | 2018-06-19 | 3 | -4/+0 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jl-update-jupyterhub-docs' into 'master' | Marcia Ramos | 2018-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Clarify jupyterhub docs to indicate OAuth is enabled and HTTPS is not yet sup...jl-update-jupyterhub-docs | Joshua Lambert | 2018-06-19 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'qa-improve-main-login-page' into 'master'bjk/gh_importer_labels | Robert Speicher | 2018-06-19 | 2 | -31/+37 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Make Page::Main::Login#sign_in_using_credentials gracefully bail out when use...qa-improve-main-login-page | Rémy Coutable | 2018-06-19 | 2 | -31/+37 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master' | Clement Ho | 2018-06-19 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix cancel automatic merge button height | Jose | 2018-06-19 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'dm-branch-api-can-push' into 'master' | Robert Speicher | 2018-06-19 | 4 | -4/+19 |
|\ \ \ \ \ \ \ \ \ \ \ |