summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'9-4-stable-patch-3Robert Speicher2017-07-311-0/+4
* Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into '...Douwe Maan2017-07-311-1/+1
* Merge branch 'add-ldap-ssl-certificate-verification-9-4' into '9-4-stable-pat...Simon Knox2017-07-272-7/+61
|\
| * Merge branch 'mk-add-ldap-ssl-certificate-verification' into 'master'add-ldap-ssl-certificate-verification-9-4Douwe Maan2017-07-262-7/+61
* | Add patch for Prometheus metric updates.Ben Kochie2017-07-271-1/+1
* | Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'Sean McGivern2017-07-271-0/+3
|/
* Merge branch '35330-fix-nginx-add-haproxy' into 'master'Tim Zallmann2017-07-241-1/+22
* Revert "Merge branch 'bjk/metric_names' into 'master'"9-4-stable-prepare-rc6James Edwards-Jones2017-07-211-1/+1
* Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-201-1/+1
* Merge branch 'bvl-free-system-namespace' into 'master'Sean McGivern2017-07-201-2/+2
* Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-201-1/+1
* Merge branch 'pawel/update_prometheus' into 'master'Rémy Coutable2017-07-202-5/+12
* Merge branch '35174-fix-aws-elb-query' into 'master'Tim Zallmann2017-07-201-1/+1
* Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-191-2/+2
* Merge branch 'instrument-ability' into 'master'Yorick Peterse2017-07-141-0/+4
* Merge branch '33949-remove-healthcheck-access-token' into 'master'9-4-stable-prepare-RC1Sean McGivern2017-07-113-6/+12
* Merge branch 'revert_bootsnap' into 'master'Robert Speicher2017-07-111-6/+0
* Merge branch 'catch-redis-address-error' into 'master'Stan Hu2017-07-111-1/+1
* Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
* Merge branch 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan2017-07-071-1/+2
|\
| * move CreatedAtFilter to concerns folderJames Lopez2017-07-071-1/+2
* | Merge branch '20628-add-oauth-implicit-grant' into 'master'Douwe Maan2017-07-071-3/+1
|\ \
| * | #20628 Enable implicit flow in Gitlab as OAuth ProviderMateusz Pytel2017-07-071-3/+1
* | | Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan2017-07-071-10/+4
|\ \ \
| * | | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-071-10/+4
* | | | Merge branch '34737-authentiq-oauth-feature-spec' into 'master'Douwe Maan2017-07-071-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Test logging in via the Authentiq OAuth provider in a feature spec.34737-authentiq-oauth-feature-specTimothy Andrew2017-07-071-1/+4
| | |/ | |/|
* | | Native group milestonesFelipe Artur2017-07-071-1/+1
* | | Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann2017-07-071-1/+1
* | | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński2017-07-071-0/+8
|\ \ \
| * | | Wrap additional routes by dash(-). And remove those routes from path_regex.rb.Shinya Maeda2017-07-071-4/+6
| * | | Basic BE changeShinya Maeda2017-07-071-0/+6
| |/ /
* | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-073-10/+3
|\ \ \ | |/ / |/| |
| * | Remove option to disable Gitaly completelyJacob Vosmaer2017-07-073-10/+3
* | | Merge branch 'fix-routes-in-production-mode' into 'master'Douwe Maan2017-07-061-1/+5
|\ \ \
| * | | Fix shorter route helpers in production environmentfix-routes-in-production-modeSean McGivern2017-07-061-1/+5
| |/ /
* | | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-062-2/+2
* | | Just draw :legacy_builds34702-draw-legacy-buildsLin Jen-Shin2017-07-062-2/+23
* | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-061-0/+43
|\ \ \ | |/ / |/| |
| * | Remove Authentiq from the OAuth login integration tests.Timothy Andrew2017-07-061-4/+0
| * | Fix build for !11963.Timothy Andrew2017-07-061-22/+3
| * | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-061-0/+66
* | | Merge branch '34636-update-prometheus-metrics-library' into 'master'Tim Zallmann2017-07-061-18/+68
|\ \ \
| * | | Add NGINX metrics and other minor changes34636-update-prometheus-metrics-libraryJoshua Lambert2017-07-041-37/+53
| * | | Add ELB metricsJoshua Lambert2017-07-031-2/+36
| |/ /
* | | Merge branch 'dm-project-path-helpers-try-2' into 'master'Sean McGivern2017-07-053-3/+23
|\ \ \
| * | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-053-3/+23
| * | | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-051-47/+0
| * | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-051-0/+47
| |\ \ \
| | * | | Fix build for !11963.Timothy Andrew2017-07-031-22/+3
View Lorry Controller Status