Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '38877-disable-autocomplete-in-filtered-search' into 'master' | Clement Ho | 2017-11-22 | 3 | -1/+11 |
|\ | |||||
| * | Disables autocomplete in filtered search | Jacopo | 2017-11-20 | 3 | -1/+11 |
* | | Merge branch '40295-fix-reply-quote-shortcut-on-mr' into 'master' | Clement Ho | 2017-11-22 | 4 | -1/+55 |
|\ \ | |||||
| * | | Fix reply quote keyboard shortcut on MRs40295-fix-reply-quote-shortcut-on-mr | Eric Eastwood | 2017-11-21 | 4 | -1/+55 |
* | | | Merge branch 'qa/gb/backport-geo-integration-tests-commons' into 'master' | Rémy Coutable | 2017-11-22 | 11 | -4/+153 |
|\ \ \ | |||||
| * | | | Backport QA code that belongs to CE from EE Geoqa/gb/backport-geo-integration-tests-commons | Rémy Coutable | 2017-11-22 | 11 | -4/+153 |
* | | | | Merge branch 'improve-extra-queries-output' into 'master' | Rémy Coutable | 2017-11-22 | 2 | -5/+12 |
|\ \ \ \ | |||||
| * | | | | Improve output for extra queries in specsimprove-extra-queries-output | Sean McGivern | 2017-11-22 | 2 | -5/+12 |
* | | | | | Merge branch 'docs-install-locale-compile' into 'master' | Rubén Dávila | 2017-11-22 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Switch to using gettext:compile instead of gettext:pack in the installdocs-install-locale-compile | DJ Mountney | 2017-11-20 | 1 | -2/+1 |
* | | | | | | Merge branch '40354-improve-ee_compat_check' into 'master' | Sean McGivern | 2017-11-22 | 2 | -32/+39 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Try to find the merge-base against the canonical master | Rémy Coutable | 2017-11-22 | 2 | -32/+39 |
* | | | | | | | Merge branch 'group-new-miletone-breadcrumb' into 'master' | Filipa Lacerda | 2017-11-22 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed new group milestone breadcrumb | Phil Hughes | 2017-11-22 | 2 | -1/+5 |
* | | | | | | | | Merge branch '39720-group-milestone-sorting' into 'master' | Sean McGivern | 2017-11-22 | 6 | -1/+133 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add group milestone to feature spec and minor changes | George Andrinopoulos | 2017-11-07 | 4 | -30/+13 |
| * | | | | | | | Add Group Milestone sorting | George Andrinopoulos | 2017-11-07 | 7 | -1/+150 |
* | | | | | | | | Merge branch 'sh-add-query-recorder-debugging' into 'master' | Sean McGivern | 2017-11-22 | 2 | -0/+53 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add QUERY_RECORDER_DEBUG environment variable to improve performance debuggingsh-add-query-recorder-debugging | Stan Hu | 2017-11-21 | 2 | -0/+53 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'feature_add_mermaid' into 'master' | Phil Hughes | 2017-11-22 | 19 | -41/+211 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Add support of Mermaid | Vitaliy @blackst0ne Klachkov | 2017-11-22 | 19 | -41/+211 |
* | | | | | | | | Merge branch 'gitaly-fetch-source-branch' into 'master' | Sean McGivern | 2017-11-22 | 8 | -11/+49 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add FetchSourceBranch Gitaly call | Jacob Vosmaer (GitLab) | 2017-11-22 | 8 | -11/+49 |
|/ / / / / / / | |||||
* | | | | | | | Update VERSION to 10.3.0-prev10.3.0.pre | Michael Kozono | 2017-11-21 | 1 | -1/+1 |
* | | | | | | | Update CHANGELOG.md for 10.2.0 | Michael Kozono | 2017-11-21 | 147 | -744/+187 |
* | | | | | | | Merge remote-tracking branch 'dev/master' | Michael Kozono | 2017-11-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2017-11-21 | 72 | -270/+813 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix offense to the LineBreakAfterGuardClauses cop | Rémy Coutable | 2017-11-20 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'fix-ci-pipelines-index' into 'master' | Yorick Peterse | 2017-11-21 | 3 | -2/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update composite pipelines index to include "id"fix-ci-pipelines-index | Yorick Peterse | 2017-11-21 | 3 | -2/+42 |
* | | | | | | | | | | Merge branch 'svg-color' into 'master' | Annabel Dunstone Gray | 2017-11-21 | 10 | -108/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | default fill color for SVGs | Simon Knox | 2017-11-21 | 10 | -108/+2 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master' | Stan Hu | 2017-11-21 | 2 | -1/+45 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` | Brett Walker | 2017-11-21 | 2 | -1/+45 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '39977-gitlab-shell-default-timeout' into 'master' | Douwe Maan | 2017-11-21 | 5 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Set the default gitlab-shell timeout to 3 hours | Nick Thomas | 2017-11-21 | 5 | -6/+11 |
* | | | | | | | | | | | Merge branch 'branch-exists-redis' into 'master' | Rémy Coutable | 2017-11-21 | 2 | -5/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Use Redis cache for branch existence checks | Jacob Vosmaer (GitLab) | 2017-11-21 | 2 | -5/+26 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'update-contributing-md-to-less-prescriptive' into 'master' | 🚄 Job van der Voort 🚀 | 2017-11-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Update CONTRIBUTING.md: Link definition of done to criteria | Victor Wu | 2017-11-21 | 1 | -0/+1 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch '10-2-hashed-storage-file-uploader' into 'master' | Stan Hu | 2017-11-21 | 2 | -15/+45 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | FileUploader should check for hashed_storage?(:attachments) to use disk_path | Gabriel Mazetto | 2017-11-21 | 2 | -15/+45 |
* | | | | | | | | | | | | Merge branch 'simplify-feature-proposals' into 'master' | 🚄 Job van der Voort 🚀 | 2017-11-21 | 1 | -42/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Simplify Feature Proposal templatesimplify-feature-proposals | Mark Pundsack | 2017-11-09 | 1 | -42/+1 |
* | | | | | | | | | | | | | Merge branch 'reduce-queries-for-artifacts-button' into 'master' | Kamil Trzciński | 2017-11-21 | 3 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Use arrays in Pipeline#latest_builds_with_artifactsreduce-queries-for-artifacts-button | Yorick Peterse | 2017-11-21 | 3 | -1/+13 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'gitaly-bundle-changes' into 'master' | Rémy Coutable | 2017-11-21 | 2 | -10/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Use `make install` for Gitaly setups in non-test environments | Alejandro Rodríguez | 2017-11-21 | 2 | -10/+17 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch '40377-blank-states' into 'master' | Annabel Dunstone Gray | 2017-11-21 | 5 | -27/+46 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix blank states using old css40377-blank-states | Filipa Lacerda | 2017-11-21 | 5 | -27/+46 |