summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
|\
| * Disabled prepared statements in testsh-disabled-prepared-statements-in-testStan Hu2017-07-102-0/+2
* | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-113-6/+12
|\ \
| * | Merge prometheus unicorn sampler settigns within monitoring settingsPawel Chojnacki2017-07-053-11/+4
| * | Add spaces between test phasesPawel Chojnacki2017-07-051-1/+1
| * | correctly handle transforming settings into useful datastructurePawel Chojnacki2017-07-051-1/+0
| * | Bring back healthcheck token access to monitoring resources, but mark this as...Pawel Chojnacki2017-07-051-1/+2
| * | Remove the need to use health check tokenPawel Chojnacki2017-07-052-0/+13
* | | Support multiple Redis instances based on queue typePaul Charlton2017-07-1110-23/+272
| |/ |/|
* | Merge branch 'master' into 'catch-redis-address-error'DJ Mountney2017-07-1016-68/+254
|\ \
| * | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"Marin Jankovski2017-07-101-6/+0
| * | Re-add Feature.register_feature_groups which is already documentedRémy Coutable2017-07-101-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
| | | * | | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-031-0/+66
| | | |/ /
| * | | | Disable Flipper memoizer in tests to avoid transient failuressh-disable-flipper-midddlware-testsStan Hu2017-07-051-2/+4
| |/ / /
| * | | Instrument Unicorn with Ruby exporterPaweł Chojnacki2017-07-043-1/+18
| |/ /
| * | Merge branch 'enable-webpack-code-splitting' into 'master'Jacob Schatz2017-06-301-2/+2
| |\ \
| | * | move webpack publicPath setup earlier in the bootstrap processes to avoid ES ...Mike Greiling2017-06-281-1/+2
| | * | dynamically set webpack publicPath when relative_url_root enabledMike Greiling2017-06-281-1/+0
| * | | Merge branch 'dm-merge-request-creations-controller' into 'master'Sean McGivern2017-06-291-12/+44
| |\ \ \
View Lorry Controller Status