Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'docs/48075-milestone-labels-can-be-confusing' into 'master'47964-custom-logo-rendering-improperly-on-sign-in-page | Mek Stittri | 2018-06-20 | 1 | -5/+5 |
|\ | |||||
| * | Resolve conflicts with latest workflow label changes | Mek Stittri | 2018-06-20 | 138 | -804/+1210 |
| |\ | |/ |/| | |||||
* | | Merge branch 'bvl-errors-in-static-analysis' into 'master' | Sean McGivern | 2018-06-20 | 2 | -13/+30 |
|\ \ | |||||
| * | | More verbose errors in static-analysis | Bob Van Landuyt | 2018-06-20 | 2 | -13/+30 |
* | | | Merge branch 'zj-can-be-merged' into 'master' | Douwe Maan | 2018-06-20 | 3 | -44/+21 |
|\ \ \ | |||||
| * | | | Move mergablility check to Gitalyzj-can-be-merged | Zeger-Jan van de Weg | 2018-06-20 | 3 | -44/+21 |
* | | | | Merge branch 'fix/favicon-cross-origin' into 'master' | Douwe Maan | 2018-06-20 | 3 | -5/+35 |
|\ \ \ \ | |||||
| * | | | | Fix: Serve favicon image always from the main GitLab domain to avoid issues w... | Alexis Reigel | 2018-06-20 | 3 | -5/+35 |
|/ / / / | |||||
* | | | | Merge branch '47631-operations-kubernetes-option-is-always-visible-when-repos... | Rémy Coutable | 2018-06-20 | 3 | -0/+44 |
|\ \ \ \ | |||||
| * | | | | Operations and Kubernetes items are now omitted in the sidebar when repositor...47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabled | Tiago Botelho | 2018-06-20 | 3 | -0/+44 |
* | | | | | Merge branch 'sh-bump-rugged-0.27.2' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -1/+6 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Bump rugged to 0.27.2sh-bump-rugged-0.27.2 | Stan Hu | 2018-06-20 | 2 | -1/+6 |
* | | | | | Merge branch 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-w... | Rémy Coutable | 2018-06-20 | 2 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | [Rails5] Fix ActionCable '/cable' mountpoint conflictblackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes | blackst0ne | 2018-06-20 | 2 | -0/+12 |
* | | | | | | Merge branch 'docs/profile-preferences' into 'master' | Marcia Ramos | 2018-06-20 | 1 | -17/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor the profile preferences docs | Achilleas Pipinellis | 2018-06-20 | 1 | -17/+9 |
* | | | | | | | Merge branch 'docs-clarify-API-share-project-to-group' into 'master' | Achilleas Pipinellis | 2018-06-20 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Docs clarify API to share project to a groupdocs-clarify-API-share-project-to-group | Andrew Winata | 2018-06-01 | 2 | -1/+5 |
* | | | | | | | | Merge branch '48126-fix-prometheus-installation' into 'master' | Kamil Trzciński (Conference till 20th) | 2018-06-20 | 9 | -34/+59 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | 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 |