summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '35616-move-gke-form-1st-iteration' into 'master'Grzegorz Bizon2017-11-071-0/+1
|\
| * Merge remote-tracking branch 'origin/master' into 35616-move-gke-form-1st-ite...Kamil Trzcinski2017-11-063-11/+19
| |\
| * \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...Shinya Maeda2017-11-051-0/+1
| |\ \
| * \ \ Merge branch '35616-move-gke-form-1st-iteration' into move-kubernetes-from-se...Shinya Maeda2017-11-041-0/+1
| |\ \ \
| | * | | Fix pipeline. Fix routing when validation failed.Shinya Maeda2017-11-011-1/+1
| | * | | Fix paths to the first pageKamil Trzcinski2017-11-011-0/+1
* | | | | Merge branch 'remove-per-cpu-metrics' into 'master'Tim Zallmann2017-11-071-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Updates CE metrics with updated versions from EE for supported metrics (EE ve...remove-per-cpu-metricsJoshua Lambert2017-11-061-2/+2
* | | | | Merge branch 'pawel/metrics-to-prometheus-33643' into 'master'Grzegorz Bizon2017-11-063-6/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only enable unicorn metrics when not in sidekiq mode.Pawel Chojnacki2017-11-021-1/+4
| * | | | Cleanup transaction metricsPawel Chojnacki2017-11-023-8/+14
| * | | | Finished Ruby SamplerPawel Chojnacki2017-11-021-1/+1
| * | | | Add GC sampler and small refactor of samplersPawel Chojnacki2017-11-022-3/+7
* | | | | Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-061-4/+0
|\ \ \ \ \
| * | | | | align with the commentsmicael.bergeron2017-11-061-3/+0
| * | | | | removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-031-2/+1
| | |/ / / | |/| | |
* | | | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-061-1/+0
| |_|_|/ |/| | |
* | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-031-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'gitaly-client-path-fix' into 'master'Douwe Maan2017-11-031-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix invalid Gitaly ClientPath configgitaly-client-path-fixKim "BKC" Carlbäcker2017-11-021-1/+1
* | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-023-4/+6
|\ \ \ \ | |/ / /
| * | | Add sudo API scopeDouwe Maan2017-11-021-2/+3
| * | | Remove Private Token from User Settings > AccountDouwe Maan2017-11-021-1/+0
| * | | Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to mon...sh-disable-unicorn-sampling-sidekiqStan Hu2017-11-011-1/+3
| |/ /
* | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-314-9/+10
|\ \ \ | |/ /
| * | Allow promoting project milestones to group milestonesFelipe Artur2017-10-311-0/+1
| * | Fix broken Members link when relative URL root paths are usedsh-fix-broken-redirection-relative-url-rootStan Hu2017-10-274-9/+9
| |/
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-293-39/+41
|\ \ | |/
| * Added ssh fingerprint, gitlab ci and pages information in an instance configu...Francisco Lopez2017-10-251-4/+5
| * Merge branch 'backort_routes_group_routes_from_ee' into 'master'Douwe Maan2017-10-231-35/+35
| |\
| | * Backport EE changes to group routesbackort_routes_group_routes_from_eeValery Sizov2017-10-221-35/+35
| * | Merge branch 'zj-peek-gitaly' into 'master'Rémy Coutable2017-10-231-0/+1
| |\ \ | | |/ | |/|
| | * Add Gitaly data to the Peek performance barZeger-Jan van de Weg2017-10-231-0/+1
* | | implement basic request inspector for use in Capybara testsMike Greiling2017-10-231-0/+1
|/ /
* | Fix inability to delete container registry tagsStan Hu2017-10-181-2/+7
* | Fix PikadayFilipa Lacerda2017-10-181-0/+7
|/
* Update database.yml.postgresqlbogdanvlviv2017-10-171-11/+10
* Set 'staging specific' in database.yml.mysqlbogdanvlviv2017-10-171-3/+18
* Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-172-19/+0
|\
| * Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-172-19/+0
* | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-172-1/+3
|\ \
| * | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-121-4/+2
| * | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1013-14/+46
| |\ \
| * | | Don't use canonical path for group childrenBob Van Landuyt2017-10-041-3/+4
| * | | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-0/+3
| * | | Remove the subgroups path on a groupBob Van Landuyt2017-10-041-1/+0
| * | | Add a `WithPagination` concern to reuse across serializersBob Van Landuyt2017-10-041-0/+1
* | | | Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-161-13/+13
|\ \ \ \
| * | | | Move global boards routes under "-" scopeValery Sizov2017-10-131-13/+13
| | |_|/ | |/| |
* | | | Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into ...Douwe Maan2017-10-161-5/+7
|\ \ \ \