Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sh-fix-error-500-no-avatars' into 'master' | Robert Speicher | 2018-01-22 | 3 | -1/+23 |
|\ | |||||
| * | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatars | Stan Hu | 2018-01-20 | 3 | -1/+23 |
* | | Merge branch '40029-better-error-handling-on-issuable-templates' into 'master' | Clement Ho | 2018-01-22 | 2 | -1/+6 |
|\ \ | |||||
| * | | Stop loading spinner on error of issuable templates | Takuya Noguchi | 2018-01-21 | 2 | -1/+6 |
| |/ | |||||
* | | Merge branch 'gitlab-shell-6.0.2' into 'master' | Robert Speicher | 2018-01-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Use gitlab-shell 6.0.2gitlab-shell-6.0.2 | Jacob Vosmaer | 2018-01-22 | 1 | -1/+1 |
* | | | Merge branch 'workhorse-3.5.1' into 'master' | Robert Speicher | 2018-01-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Use gitlab-workhorse 3.5.1workhorse-3.5.1 | Jacob Vosmaer | 2018-01-22 | 1 | -1/+1 |
* | | | | Merge branch 'gitaly-git-http-ssh' into 'master' | Douwe Maan | 2018-01-22 | 4 | -36/+31 |
|\ \ \ \ | |||||
| * | | | | Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH ... | Jacob Vosmaer (GitLab) | 2018-01-22 | 4 | -36/+31 |
|/ / / / | |||||
* | | | | Merge branch 'bvl-parent-preloading' into 'master' | Douwe Maan | 2018-01-22 | 6 | -14/+102 |
|\ \ \ \ | |||||
| * | | | | Preload ancestors for subgroups matching filter | Bob Van Landuyt | 2018-01-22 | 3 | -12/+60 |
| * | | | | Don't include projects shared as group-descendants | Bob Van Landuyt | 2018-01-22 | 2 | -3/+14 |
| * | | | | Fix filter on `dashboard/groups` & `explore/groups | Bob Van Landuyt | 2018-01-22 | 3 | -1/+30 |
* | | | | | Merge branch 'gitaly-write-ref-error-handling' into 'master' | Robert Speicher | 2018-01-22 | 2 | -22/+20 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Move error-handling to lib/gitlab/git | Kim "BKC" Carlbäcker | 2018-01-22 | 2 | -13/+5 |
| * | | | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handling | Kim "BKC" Carlbäcker | 2018-01-18 | 2 | -18/+24 |
* | | | | | Merge branch 'sh-scheduled-ci-pipeline-docs' into 'master' | Achilleas Pipinellis | 2018-01-22 | 3 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Add docs for playing a CI pipeline schedule | Stan Hu | 2018-01-22 | 3 | -0/+15 |
|/ / / / / | |||||
* | | | | | Merge branch 'dispatcher-ph-more' into 'master' | Filipa Lacerda | 2018-01-22 | 4 | -16/+34 |
|\ \ \ \ \ | |||||
| * | | | | | Added dispatcher imports for sessions routedispatcher-ph-more | Phil Hughes | 2018-01-22 | 4 | -16/+34 |
* | | | | | | Merge branch 'ce-fix-upload-model-tainted-after-migration-spec' into 'master' | Rémy Coutable | 2018-01-22 | 1 | -3/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix the Upload model being tainted after migration spec | Micael Bergeron | 2018-01-22 | 1 | -3/+10 |
* | | | | | | | Merge branch '41673-blank-query-members-api' into 'master' | Rémy Coutable | 2018-01-22 | 7 | -2/+47 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Yield no results for blank searches on User name, username and email | Mark Fletcher | 2018-01-21 | 2 | -0/+20 |
| * | | | | | | Fix error on empty query for Members API | Mark Fletcher | 2018-01-21 | 5 | -2/+27 |
* | | | | | | | Merge branch 'feat/add-section-headers-to-plus-button-dropdown' into 'master' | Annabel Dunstone Gray | 2018-01-22 | 2 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add section headers to plus button dropdown | George Tsiolis | 2018-01-19 | 2 | -0/+9 |
* | | | | | | | | Merge branch '41208-commit-atom-feeds-double-escaped' into 'master' | Douwe Maan | 2018-01-22 | 3 | -3/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allows html in commits atom feed | Jacopo | 2018-01-22 | 3 | -3/+14 |
* | | | | | | | | | Merge branch 'docs/refactor-k8s-cluster' into 'master' | Marcia Ramos | 2018-01-22 | 2 | -45/+241 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Copy k8s service integration info into clusters | Achilleas Pipinellis | 2018-01-22 | 2 | -66/+171 |
| * | | | | | | | | | Port the cluster docs from EE to CE | Achilleas Pipinellis | 2018-01-22 | 1 | -41/+132 |
* | | | | | | | | | | Update VERSION to 10.5.0-prev10.5.0.pre | Luke Bennett | 2018-01-22 | 1 | -1/+1 |
* | | | | | | | | | | Update CHANGELOG.md for 10.4.0 | Luke Bennett | 2018-01-22 | 138 | -695/+164 |
* | | | | | | | | | | Merge branch '42212-order-of-steps-in-auto-devops-do' into 'master' | Achilleas Pipinellis | 2018-01-22 | 1 | -28/+28 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Change order of jobs in Auto DevOps doc42212-order-of-steps-in-auto-devops-do | Fabio Busatto | 2018-01-19 | 1 | -28/+28 |
* | | | | | | | | | | Merge branch 'vue-mr-widget-state' into 'master' | Phil Hughes | 2018-01-22 | 4 | -69/+89 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into vue-mr-widget-state | Filipa Lacerda | 2018-01-22 | 71 | -86/+198 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Update icon to match EEvue-mr-widget-state | Filipa Lacerda | 2018-01-19 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'master' into vue-mr-widget-state | Filipa Lacerda | 2018-01-19 | 205 | -2516/+3797 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Move mr_widget_auto_merge_failed component into a vue file | Filipa Lacerda | 2018-01-18 | 5 | -69/+92 |
* | | | | | | | | | | | Merge branch 'docs/dast-cleanup' into 'master' | Marcia Ramos | 2018-01-22 | 1 | -8/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add more info on how DAST works | Achilleas Pipinellis | 2018-01-22 | 1 | -8/+13 |
* | | | | | | | | | | | Merge branch 'patch-19' into 'master' | Rémy Coutable | 2018-01-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | typo fix | Ben Bodenmiller | 2018-01-18 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'split-setup-test-env' into 'master' | Rémy Coutable | 2018-01-22 | 1 | -3/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Split the setup-test-env job in two | Nick Thomas | 2018-01-19 | 1 | -3/+16 |
* | | | | | | | | | | | | Merge branch '42225-mr-icons' into 'master' | Phil Hughes | 2018-01-22 | 12 | -15/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Backport to match EE icons42225-mr-icons | Filipa Lacerda | 2018-01-19 | 12 | -15/+15 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | |