summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-223-1/+23
|\
| * Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-203-1/+23
* | Merge branch '40029-better-error-handling-on-issuable-templates' into 'master'Clement Ho2018-01-222-1/+6
|\ \
| * | Stop loading spinner on error of issuable templatesTakuya Noguchi2018-01-212-1/+6
| |/
* | Merge branch 'gitlab-shell-6.0.2' into 'master'Robert Speicher2018-01-221-1/+1
|\ \
| * | Use gitlab-shell 6.0.2gitlab-shell-6.0.2Jacob Vosmaer2018-01-221-1/+1
* | | Merge branch 'workhorse-3.5.1' into 'master'Robert Speicher2018-01-221-1/+1
|\ \ \
| * | | Use gitlab-workhorse 3.5.1workhorse-3.5.1Jacob Vosmaer2018-01-221-1/+1
* | | | Merge branch 'gitaly-git-http-ssh' into 'master'Douwe Maan2018-01-224-36/+31
|\ \ \ \
| * | | | Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH ...Jacob Vosmaer (GitLab)2018-01-224-36/+31
|/ / / /
* | | | Merge branch 'bvl-parent-preloading' into 'master'Douwe Maan2018-01-226-14/+102
|\ \ \ \
| * | | | Preload ancestors for subgroups matching filterBob Van Landuyt2018-01-223-12/+60
| * | | | Don't include projects shared as group-descendantsBob Van Landuyt2018-01-222-3/+14
| * | | | Fix filter on `dashboard/groups` & `explore/groupsBob Van Landuyt2018-01-223-1/+30
* | | | | Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-222-22/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move error-handling to lib/gitlab/gitKim "BKC" Carlbäcker2018-01-222-13/+5
| * | | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handlingKim "BKC" Carlbäcker2018-01-182-18/+24
* | | | | Merge branch 'sh-scheduled-ci-pipeline-docs' into 'master'Achilleas Pipinellis2018-01-223-0/+15
|\ \ \ \ \
| * | | | | Add docs for playing a CI pipeline scheduleStan Hu2018-01-223-0/+15
|/ / / / /
* | | | | Merge branch 'dispatcher-ph-more' into 'master'Filipa Lacerda2018-01-224-16/+34
|\ \ \ \ \
| * | | | | Added dispatcher imports for sessions routedispatcher-ph-morePhil Hughes2018-01-224-16/+34
* | | | | | Merge branch 'ce-fix-upload-model-tainted-after-migration-spec' into 'master'Rémy Coutable2018-01-221-3/+10
|\ \ \ \ \ \
| * | | | | | Fix the Upload model being tainted after migration specMicael Bergeron2018-01-221-3/+10
* | | | | | | Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-227-2/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Yield no results for blank searches on User name, username and emailMark Fletcher2018-01-212-0/+20
| * | | | | | Fix error on empty query for Members APIMark Fletcher2018-01-215-2/+27
* | | | | | | Merge branch 'feat/add-section-headers-to-plus-button-dropdown' into 'master'Annabel Dunstone Gray2018-01-222-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Add section headers to plus button dropdownGeorge Tsiolis2018-01-192-0/+9
* | | | | | | | Merge branch '41208-commit-atom-feeds-double-escaped' into 'master'Douwe Maan2018-01-223-3/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Allows html in commits atom feedJacopo2018-01-223-3/+14
* | | | | | | | | Merge branch 'docs/refactor-k8s-cluster' into 'master'Marcia Ramos2018-01-222-45/+241
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Copy k8s service integration info into clustersAchilleas Pipinellis2018-01-222-66/+171
| * | | | | | | | | Port the cluster docs from EE to CEAchilleas Pipinellis2018-01-221-41/+132
* | | | | | | | | | Update VERSION to 10.5.0-prev10.5.0.preLuke Bennett2018-01-221-1/+1
* | | | | | | | | | Update CHANGELOG.md for 10.4.0Luke Bennett2018-01-22138-695/+164
* | | | | | | | | | Merge branch '42212-order-of-steps-in-auto-devops-do' into 'master'Achilleas Pipinellis2018-01-221-28/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Change order of jobs in Auto DevOps doc42212-order-of-steps-in-auto-devops-doFabio Busatto2018-01-191-28/+28
* | | | | | | | | | Merge branch 'vue-mr-widget-state' into 'master'Phil Hughes2018-01-224-69/+89
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-2271-86/+198
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Update icon to match EEvue-mr-widget-stateFilipa Lacerda2018-01-191-1/+1
| * | | | | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-19205-2516/+3797
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move mr_widget_auto_merge_failed component into a vue fileFilipa Lacerda2018-01-185-69/+92
* | | | | | | | | | | Merge branch 'docs/dast-cleanup' into 'master'Marcia Ramos2018-01-221-8/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Add more info on how DAST worksAchilleas Pipinellis2018-01-221-8/+13
* | | | | | | | | | | Merge branch 'patch-19' into 'master'Rémy Coutable2018-01-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | typo fixBen Bodenmiller2018-01-181-1/+1
* | | | | | | | | | | Merge branch 'split-setup-test-env' into 'master'Rémy Coutable2018-01-221-3/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Split the setup-test-env job in twoNick Thomas2018-01-191-3/+16
* | | | | | | | | | | | Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-2212-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-1912-15/+15
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |