summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix broken karma specs due to removed functionMike Greiling2018-01-312-28/+2
* style the prometheus integration service page according to designMike Greiling2018-01-313-10/+33
* hide prometheus manual integration form when auto config is activeMike Greiling2018-01-312-18/+27
* change prometheus service description text to match designMike Greiling2018-01-3118-18/+18
* add link to cluster configuration from prometheus "getting started" stateMike Greiling2018-01-314-10/+31
* Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-31185-1665/+3243
|\
| * Merge branch '4761-follow-up-from-resolve-developers-should-be-able-to-create...Rémy Coutable2018-01-311-2/+2
| |\
| | * refactor groups controller to match EE4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-groupJames Lopez2018-01-311-2/+2
| * | Merge branch 'fix-install-docs' into 'master'Nick Thomas2018-01-313-5/+10
| |\ \
| | * | [ci skip] Fix example commands to refer to the correct versionsAlejandro Rodríguez2018-01-313-5/+10
| |/ /
| * | Merge branch 'fl-mr-widget' into 'master'Phil Hughes2018-01-315-122/+94
| |\ \
| | * | Fix broken testfl-mr-widgetFilipa Lacerda2018-01-312-3/+3
| | * | Move mr widget related links into a vue fileFilipa Lacerda2018-01-305-123/+95
| * | | Merge branch 'axios-get-render-math' into 'master'Phil Hughes2018-01-311-13/+25
| |\ \ \
| | * | | Replace $.get in render math with axiosaxios-get-render-mathClement Ho2018-01-301-13/+25
| * | | | Merge branch 'axios-common-utils-favicon' into 'master'Fatih Acet2018-01-313-39/+38
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Use axios instead of jquery ajax for setCiStatusFaviconClement Ho2018-01-313-39/+38
| |/ / /
| * | | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-314-18/+14
| |\ \ \
| | * | | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-304-18/+14
| * | | | Merge branch 'sh-fix-project-members-api-perf' into 'master'Rémy Coutable2018-01-316-30/+46
| |\ \ \ \
| | * | | | Remove N+1 queries with /projects/:project_id/{access_requests,members} API e...sh-fix-project-members-api-perfStan Hu2018-01-306-30/+46
| * | | | | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-3111-102/+551
| |\ \ \ \ \
| | * | | | | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-3113-106/+555
| * | | | | | Merge branch 'qa-new-dropzone-component' into 'master'Grzegorz Bizon2018-01-314-17/+41
| |\ \ \ \ \ \
| | * | | | | | Introduce a new QA::Gitlab::Page::Component::Dropzone classRémy Coutable2018-01-314-17/+41
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'Grzegorz Bizon2018-01-312-1/+19
| |\ \ \ \ \ \
| | * | | | | | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-gitAhmad Sherif2018-01-302-19/+19
| * | | | | | | Merge branch 'sh-fix-events-collection' into 'master'Rémy Coutable2018-01-313-1/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Fix not all events being shown in group dashboardsh-fix-events-collectionStan Hu2018-01-303-1/+29
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'rc/remove-brakeman-from-codequality' into 'master'Dmitriy Zaporozhets2018-01-311-2/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove brakeman from .codeclimate.yml since it's now covered by the sast CI jobrc/remove-brakeman-from-codequalityRémy Coutable2018-01-301-2/+0
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch '42239-fix-mysql-source-installs' into 'master'Rémy Coutable2018-01-312-44/+48
| |\ \ \ \ \ \ \
| | * | | | | | | Don't assume postgresql in two initializersNick Thomas2018-01-302-44/+48
| * | | | | | | | Merge branch '4635-unify-jobs-and-builds-sepc' into 'master'Rémy Coutable2018-01-312-52/+73
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make those files as close as EE to reduce conflicts4635-unify-jobs-and-builds-sepcLin Jen-Shin2018-01-312-52/+73
| * | | | | | | | | Merge branch 'update-qa-docs-with-directory-req' into 'master'Grzegorz Bizon2018-01-311-0/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add note about being in the `qa` directory for `bin/qa` to workupdate-qa-docs-with-directory-reqEric Eastwood2018-01-311-0/+3
| * | | | | | | | | | Merge branch 'ph-ajax-to-axios' into 'master'Filipa Lacerda2018-01-3115-284/+230
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fixed failing specsph-ajax-to-axiosPhil Hughes2018-01-302-2/+2
| | * | | | | | | | | | potential fix for tests crashingPhil Hughes2018-01-301-2/+3
| | * | | | | | | | | | EE backport for callback being optionalPhil Hughes2018-01-301-1/+1
| | * | | | | | | | | | more EE backportsPhil Hughes2018-01-301-2/+10
| | * | | | | | | | | | backported changed from EEPhil Hughes2018-01-301-1/+5
| | * | | | | | | | | | fixed failing IDE testPhil Hughes2018-01-301-1/+1
| | * | | | | | | | | | fixed more unhandled promise rejectionsPhil Hughes2018-01-302-5/+13
| | * | | | | | | | | | fixed unhandled promise rejectionPhil Hughes2018-01-301-2/+4
| | * | | | | | | | | | changed commits.js to axiosPhil Hughes2018-01-302-28/+49
| | * | | | | | | | | | converted blob viewer to axiosPhil Hughes2018-01-302-33/+25
| | * | | | | | | | | | spec fixes after API axios changePhil Hughes2018-01-303-11/+19
| | * | | | | | | | | | Converted API.js to axiosPhil Hughes2018-01-305-200/+102
View Lorry Controller Status