Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480 | Pawel Chojnacki | 2018-02-07 | 2 | -0/+12 |
* | Avoid unless/else | Pawel Chojnacki | 2018-02-07 | 1 | -4/+4 |
* | Fix order of checks in editable? method. | Pawel Chojnacki | 2018-02-07 | 3 | -6/+7 |
* | Make prometheus service querying approach much nicer wrt to arity and default... | Pawel Chojnacki | 2018-02-07 | 4 | -4/+30 |
* | add i8n to the Prometheus integration settings page | Mike Greiling | 2018-02-06 | 1 | -8/+8 |
* | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480 | Mike Greiling | 2018-02-06 | 715 | -4180/+11964 |
|\ | |||||
| * | Merge branch 'dm-user-namespace-route-path-validation' into 'master' | Sean McGivern | 2018-02-06 | 6 | -16/+36 |
| |\ | |||||
| | * | Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validation | Douwe Maan | 2018-02-06 | 6 | -16/+36 |
| * | | Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master' | Stan Hu | 2018-02-06 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Explicitly set cwd in Sidekiq memory killer instead of depending on getcwddm-sidekiq-memory-killer-getcwd | Douwe Maan | 2018-02-06 | 1 | -1/+1 |
| * | | | Merge branch 'ce-4813-quickfix' into 'master' | Sean McGivern | 2018-02-06 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Reset Project's column information in spec/lib/gitlab/background_migration/po...ce-4813-quickfix | Rémy Coutable | 2018-02-06 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge branch '42730-close-rugged-repository' into 'master' | Douwe Maan | 2018-02-06 | 5 | -1/+19 |
| |\ \ \ | |||||
| | * | | | Close low level rugged repository in project cache worker | Bastian Blank | 2018-02-06 | 5 | -1/+19 |
| * | | | | Merge branch 'zj/gitlab-ce-zj-wiki-page-versions' | Douwe Maan | 2018-02-06 | 4 | -19/+75 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into 'zj-wiki-page-versions' | Douwe Maan | 2018-02-06 | 1370 | -12520/+25427 |
| | |\ \ \ \ | |||||
| | * | | | | | Allow pagination for WikiVersions on Gitaly request | Zeger-Jan van de Weg | 2018-01-22 | 3 | -43/+19 |
| | * | | | | | Upgrade Gitaly versions | Zeger-Jan van de Weg | 2018-01-22 | 1 | -1/+1 |
| | * | | | | | Client implementation for WikiPageVerion | Zeger-Jan van de Weg | 2018-01-22 | 4 | -25/+105 |
| * | | | | | | Merge branch 'gitaly-lfs-client-prep' into 'master' | Robert Speicher | 2018-02-06 | 8 | -92/+81 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Refactor Gitlab::Git code related to LFS changes for Gitaly migrationgitaly-lfs-client-prep | Alejandro Rodríguez | 2018-02-02 | 8 | -92/+81 |
| * | | | | | | Merge branch 'zj-protobuf' into 'master' | Marin Jankovski | 2018-02-06 | 4 | -2/+10 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Downgrade google-protobuf | Zeger-Jan van de Weg | 2018-02-06 | 4 | -2/+10 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch '42669-allow-order_by-users-in-gitlab-api' into 'master' | Douwe Maan | 2018-02-06 | 4 | -1/+46 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add sorting options for /users API (admin only)42669-allow-order_by-users-in-gitlab-api | Dmitriy Zaporozhets | 2018-02-06 | 4 | -1/+46 |
| * | | | | | | | Merge branch 'jej/upload-file-tracks-lfs' into 'master' | Sean McGivern | 2018-02-06 | 7 | -1/+203 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | File upload UI obeys LFS filters | James Edwards-Jones | 2018-02-06 | 7 | -1/+203 |
| * | | | | | | | Merge branch 'winh-kubernetes-clusters' into 'master' | Phil Hughes | 2018-02-06 | 38 | -192/+262 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clusters | Winnie Hellmann | 2018-02-06 | 38 | -192/+262 |
| * | | | | | | | | Merge branch 'bump-workhorse' into 'master' | Nick Thomas | 2018-02-06 | 4 | -1/+35 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Upgrade GitLab Workhorse to v3.6.0 | Kamil Trzciński | 2018-02-06 | 4 | -1/+35 |
| * | | | | | | | | | Merge branch '14256-upload-destroy-removes-file' into 'master' | Sean McGivern | 2018-02-06 | 5 | -0/+54 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | improvements from feedback14256-upload-destroy-removes-file | Micaël Bergeron | 2018-02-06 | 3 | -2/+14 |
| | * | | | | | | | | | [ci-skip] add changelog | Micaël Bergeron | 2018-02-06 | 1 | -0/+5 |
| | * | | | | | | | | | remove file after `Upload#destroy` | Micaël Bergeron | 2018-02-06 | 3 | -0/+37 |
| * | | | | | | | | | | Merge branch '42693-add-a-link-to-documentation-on-how-to-get-external-ip-in-... | Tim Zallmann | 2018-02-06 | 6 | -4/+35 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Resolve "Add a link to documentation on how to get external ip in the Kuberne... | Fabio Busatto | 2018-02-06 | 6 | -4/+35 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'feature/sm/artifacts-trace' into 'master' | Kamil Trzciński | 2018-02-06 | 28 | -61/+1556 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Reorder async/sync tasks in BuildFinishedWorker to read traces efficientlyfeature/sm/artifacts-trace | Shinya Maeda | 2018-02-06 | 2 | -12/+11 |
| | * | | | | | | | | | Fix tests for Drop filename enforcement | Shinya Maeda | 2018-02-06 | 2 | -17/+1 |
| | * | | | | | | | | | Revert using expand_fixture_path in factory | Shinya Maeda | 2018-02-06 | 1 | -1/+1 |
| | * | | | | | | | | | Revert "Add FixtureHelpers for FactoryGirl" | Shinya Maeda | 2018-02-06 | 1 | -3/+0 |
| | * | | | | | | | | | Refactor :trace to :trace_live in spec | Shinya Maeda | 2018-02-06 | 8 | -25/+25 |
| | * | | | | | | | | | Make all workers in BuildFinishedWorker to run async and reorder | Shinya Maeda | 2018-02-06 | 1 | -2/+2 |
| | * | | | | | | | | | Drop filename enforcement | Shinya Maeda | 2018-02-06 | 1 | -6/+0 |
| | * | | | | | | | | | Add FixtureHelpers for FactoryGirl | Shinya Maeda | 2018-02-06 | 1 | -0/+3 |
| | * | | | | | | | | | GB catches: CreateTraceArtifactService project, user pass | Shinya Maeda | 2018-02-06 | 1 | -2/+2 |
| | * | | | | | | | | | Alessio catches: Test fix | Shinya Maeda | 2018-02-06 | 2 | -2/+2 |
| | * | | | | | | | | | Backport sample_trace in fixtures | Shinya Maeda | 2018-02-06 | 1 | -16/+1183 |
| | * | | | | | | | | | Remove unnecessary changes for job features spec | Shinya Maeda | 2018-02-06 | 1 | -5/+5 |