summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'add-typescript' into 'master'"Jacob Schatz2017-11-101-5/+1
* Merge branch '32059-fix-oauth-phishing' into 'security-10-1'Douwe Maan2017-11-101-1/+9
* Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-081-0/+2
|\
| * Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-0/+2
* | Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-081-1/+1
|\ \
| * | Change Sign Out route from a DELETE to a GETJoe Marty2017-11-061-1/+1
* | | Merge branch 'bvl-free-paths' into 'master'Douwe Maan2017-11-081-21/+31
|\ \ \
| * | | Free up some group reserved wordsBob Van Landuyt2017-11-071-27/+30
| * | | Free up `avatar`, `group_members` and `milestones` as pathsBob Van Landuyt2017-11-071-15/+16
| * | | Free up `labels` as a group nameBob Van Landuyt2017-11-071-4/+10
| | |/ | |/|
* | | Merge branch 'jivl-fix-karma-config-file' into 'master'Mike Greiling2017-11-081-9/+0
|\ \ \
| * | | fix karma config filejivl-fix-karma-config-fileJose Ivan Vargas2017-11-071-9/+0
| |/ /
* | | Adds typescript support in webpack. With Mike G.Jacob Schatz2017-11-071-1/+5
|/ /
* | Fix wildcard route and use param styleShinya Maeda2017-11-071-1/+1
* | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-072-2/+3
|\ \
| * \ 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 'master' into 38464-k8s-appsShinya Maeda2017-11-074-11/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 'master' into sh-headless-chrome-supportMike Greiling2017-11-023-4/+6
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-314-9/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-293-39/+41
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | implement basic request inspector for use in Capybara testsMike Greiling2017-10-231-0/+1
* | | | | | Add Projects::Clusters::ApplicationsController testsAlessio Caiazza2017-11-031-1/+1
* | | | | | Fix typosAlessio Caiazza2017-11-031-1/+1
* | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-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 remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-033-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
| |/ / /
* | | | Fix and add applications controllerKamil Trzcinski2017-11-021-2/+2
* | | | Improve backend structure of dataKamil Trzcinski2017-11-021-0/+4
|/ / /
* | | Allow promoting project milestones to group milestonesFelipe Artur2017-10-311-0/+1