summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make trainee maintainers three times as likely to be picked60035-weight-trainee-maintainers-higher-in-reviewer-rouletteSean McGivern2019-04-051-2/+4
* Merge branch 'sh-update-rails-5.0.7.2' into 'master'Robert Speicher2019-04-053-36/+41
|\
| * Upgrade globalid and i8n gems to match Rails 5.0.7.2sh-update-rails-5.0.7.2Stan Hu2019-04-041-2/+2
| * Update Rails to 5.0.7.2Stan Hu2019-04-043-34/+39
* | Merge branch 'gitaly-version-v1.32.0' into 'master'Douwe Maan2019-04-052-1/+6
|\ \
| * | Upgrade Gitaly to v1.32.0GitalyBot2019-04-052-1/+6
|/ /
* | Merge branch 'bump_kubernetes_1_11_9' into 'master'Douwe Maan2019-04-053-3/+8
|\ \
| * | Bump Helm to 2.13.1 and kubectl to 1.11.9bump_kubernetes_1_11_9Thong Kuah2019-04-053-3/+8
* | | Merge branch '59570-remove-due-date-quick-action' into 'master'Sean McGivern2019-04-052-34/+27
|\ \ \
| * | | Extract remove due date spec to shared example59570-remove-due-date-quick-actionAlexandru Croitor2019-04-052-34/+27
* | | | Merge branch '58717-checkbox-cannot-be-checked-if-a-blockquote-is-above' into...Sean McGivern2019-04-056-3/+49
|\ \ \ \
| * | | | Fenced blockquotes to not change source line pos58717-checkbox-cannot-be-checked-if-a-blockquote-is-aboveBrett Walker2019-04-046-3/+49
* | | | | Merge branch '58375-api-controller' into 'master'Sean McGivern2019-04-057-0/+204
|\ \ \ \ \
| * | | | | Use environment_params when defining expected_params58375-api-controllerrpereira22019-04-051-10/+8
| * | | | | Allow message strings to be translatedrpereira22019-04-052-2/+8
| * | | | | Do not hardcode project and namespace name in urlrpereira22019-04-051-3/+3
| * | | | | Call permit! on paramsrpereira22019-04-052-2/+15
| * | | | | Remove permitting of paramsrpereira22019-04-052-21/+5
| * | | | | Add spec for invalid environment idrpereira22019-04-052-2/+11
| * | | | | Make filter params specs more readablePeter Leitzen2019-04-051-5/+7
| * | | | | Streamline controller specsPeter Leitzen2019-04-052-87/+76
| * | | | | Add a Prometheus API per environmentrpereira22019-04-056-0/+203
| * | | | | Some code improvements58375-proxy-servicerpereira22019-04-042-3/+6
| * | | | | Use hash methods to filter paramsrpereira22019-04-042-16/+12
| * | | | | Filter params based on the proxy_pathrpereira22019-04-042-32/+59
| * | | | | Rename prometheus_owner to proxyablerpereira22019-04-042-15/+15
| * | | | | Add spec for RestClient raising exceptionrpereira22019-04-041-47/+37
| * | | | | Remove no_proxy check in calculate_reactive_cacherpereira22019-04-041-1/+0
| * | | | | Remove redundant variable declarationPeter Leitzen2019-04-041-2/+1
| * | | | | Extract parsing JSONPeter Leitzen2019-04-041-6/+8
| * | | | | Start context names with lowercase letterrpereira22019-04-041-7/+7
| * | | | | Remove all superfluous bracesrpereira22019-04-042-12/+11
| * | | | | Improvements after reviewrpereira22019-04-042-37/+21
| * | | | | Remove unnecessary linerpereira22019-04-041-6/+0
| * | | | | Add a Prometheus::ProxyServicerpereira22019-04-042-0/+309
| * | | | | Add a proxy method to PrometheusClientrpereira22019-04-042-20/+115
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ce-proj-settings-ok-avatar-only' into 'master'Kushal Pandya2019-04-0514-46/+39
|\ \ \ \ \
| * | | | | Improve project avatar settingsce-proj-settings-ok-avatar-onlyLuke Bennett2019-03-2814-46/+39
* | | | | | Merge branch '59324-queries-which-return-multiple-series-are-not-working-corr...Kushal Pandya2019-04-054-8/+74
|\ \ \ \ \ \
| * | | | | | Restore multiple series supportAdriel Santiago2019-04-054-8/+74
|/ / / / / /
* | | | | | Merge branch '59570-target-branch-quick-action' into 'master'Sean McGivern2019-04-052-78/+78
|\ \ \ \ \ \
| * | | | | | Extract target branch quick action to shared example59570-target-branch-quick-actionAlexandru Croitor2019-04-042-78/+78
* | | | | | | Merge branch 'sh-bump-rack-2.0.7' into 'master'Kamil Trzciński2019-04-053-10/+3
|\ \ \ \ \ \ \
| * | | | | | | Bump rack gem to 2.0.7sh-bump-rack-2.0.7Stan Hu2019-04-043-10/+3
* | | | | | | | Merge branch 'fix-merge-request-relations-with-pipeline-on-mwps' into 'master'Kamil Trzciński2019-04-056-17/+77
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix merge requst relationships with pipeline in MWPSServicefix-merge-request-relations-with-pipeline-on-mwpsShinya Maeda2019-04-056-17/+77
| |/ / / / / / /
* | | | | | | | Merge branch 'extend-cte-optimisations-to-projects' into 'master'Dmitriy Zaporozhets2019-04-057-111/+97
|\ \ \ \ \ \ \ \
| * | | | | | | | Extend CTE search optimisation to projectsextend-cte-optimisations-to-projectsSean McGivern2019-04-047-111/+97
* | | | | | | | | Merge branch 'rubocop_examplewording' into 'master'James Lopez2019-04-05132-505/+505
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Autocorrect with RSpec/ExampleWording copThong Kuah2019-04-05132-505/+505
|/ / / / / / / / /
View Lorry Controller Status