Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_ar...fix/sm/40478-gcp_clusters_migration_culprit | Shinya Maeda | 2017-11-23 | 1 | -1/+0 |
* | Merge branch 'jivl-general-icons' into 'master' | Tim Zallmann | 2017-11-23 | 4 | -10/+15 |
|\ | |||||
| * | Change star, filter and settings icons to the their sprite based replacements | Jose Ivan Vargas Lopez | 2017-11-23 | 4 | -10/+15 |
|/ | |||||
* | Update CHANGELOG.md for 10.2.1 | Michael Kozono | 2017-11-22 | 2 | -5/+7 |
* | Merge branch '32620-speed-up-unicorn-specs' into 'master' | Rémy Coutable | 2017-11-22 | 6 | -23/+19 |
|\ | |||||
| * | Speed up Unicorn specs by using a dummy Rack application instead of GitLab | Nick Thomas | 2017-11-22 | 6 | -23/+19 |
* | | Merge branch '28377-add-edit-button-to-mobile-file-view' into 'master' | Clement Ho | 2017-11-22 | 4 | -1/+30 |
|\ \ | |||||
| * | | Add edit button to mobile file view | Travis Miller | 2017-11-22 | 4 | -1/+30 |
* | | | Merge branch '40283-fix-missing-mr-widget-status-icons' into 'master' | Tim Zallmann | 2017-11-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix missing MR widget status icons40283-fix-missing-mr-widget-status-icons | Eric Eastwood | 2017-11-22 | 1 | -1/+1 |
* | | | | Merge branch '40444-upgrade-axios-from-0-16-2-to-0-17-1' into 'master' | Filipa Lacerda | 2017-11-22 | 2 | -10/+16 |
|\ \ \ \ | |||||
| * | | | | Updated axios40444-upgrade-axios-from-0-16-2-to-0-17-1 | Tim Zallmann | 2017-11-22 | 2 | -10/+16 |
* | | | | | Merge branch 'pawel/disable_prometheus_metrics' into 'master' | Stan Hu | 2017-11-22 | 2 | -3/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Force disable Prometheus metrics | Pawel Chojnacki | 2017-11-22 | 2 | -3/+8 |
* | | | | | | Merge branch 'jivl-replace-vue-resource-prometheus-dashboard' into 'master' | Filipa Lacerda | 2017-11-22 | 3 | -26/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replaced vue-resource for axios in the prometheus dashboardjivl-replace-vue-resource-prometheus-dashboard | Jose Ivan Vargas | 2017-11-22 | 3 | -26/+14 |
* | | | | | | | 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 |
|/ / / / / / / / / / / / |